Merge branch 'dev' of huangwenjie/patient-co-management into dev

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/manager/datastatic/HealthEduController.java

@@ -2,10 +2,16 @@ package com.yihu.wlyy.controller.manager.datastatic;
import com.yihu.wlyy.controller.BaseController;
import com.yihu.wlyy.entity.SignFamily;
import com.yihu.wlyy.entity.es.HealthEduPatientCode;
import com.yihu.wlyy.entity.organization.HospitalMapping;
import com.yihu.wlyy.repository.organization.HospitalMappingDao;
import com.yihu.wlyy.service.healthedu.HealthEduService;
import com.yihu.wlyy.service.manager.sign.FamilyContractService;
import com.yihu.wlyy.util.ElasticsearchUtil;
import jxl.Workbook;
import jxl.write.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -14,7 +20,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.util.List;
import java.util.*;
/**
 * 健康教育推送报表导出
@@ -28,6 +34,17 @@ public class HealthEduController extends BaseController {
	@Autowired
	private HealthEduService healthEduService;
	
	@Value("${es.type.HealthEduArticlePatient}")
	private String esType;
	@Value("${es.index.HealthEduArticlePatient}")
	private String esIndex;
	@Autowired
	private ElasticsearchUtil elasticsearchUtil;
	@Autowired
	private FamilyContractService familyContractService;
	@Autowired
	private HospitalMappingDao hospitalMappingDao;
	
	//页面跳转（主页面）
	@RequestMapping(value = "initial")
	public String listInit() {
@@ -41,11 +58,47 @@ public class HealthEduController extends BaseController {
			@RequestParam(value = "endDate",required = false)String endDate,
			HttpServletResponse response){
		try {
			List<SignFamily> datalist = healthEduService.getPatientPushList(beginDate,endDate);
			
			List<SignFamily> signFamilies = new ArrayList<>();
			
			Map<String,String> orgcodemap = new HashMap<>();
			
			Set<String> patientcodesets = new HashSet<>();
			
			String sql = "SELECT patientCode FROM "+esType+" where createTime >='"+beginDate+"T00:00:00+0800' and createTime <='"+endDate+"T23:59:59+0800'  group by patientCode limit 0,1000000";
			
			List<HealthEduPatientCode> patientCodes = elasticsearchUtil.excute(sql, HealthEduPatientCode.class, esIndex, esType);
			
			for (HealthEduPatientCode es: patientCodes) {
				System.out.println(patientcodesets.size());
				if(patientcodesets.contains(es.getPatientCode())){
					continue;
				}else{
					patientcodesets.add(es.getPatientCode());
				}
				SignFamily obj = familyContractService.findSignByPatient(es.getPatientCode());
				if( obj == null){
					continue;
				}
				String jworgcode = "";
				if(orgcodemap.isEmpty() || !orgcodemap.keySet().contains(obj.getHospital())){
					HospitalMapping hospitalMapping =  hospitalMappingDao.findByCode(obj.getHospital());
					if(hospitalMapping == null){
						continue;
					}
					jworgcode = hospitalMapping.getMappingCode();
					orgcodemap.put(obj.getHospital(),jworgcode);
				}else{
					jworgcode = orgcodemap.get(obj.getHospital());
				}
				obj.setHospital(jworgcode);
				signFamilies.add(obj);
			}
			
			response.setContentType("octets/stream");
			response.setHeader("Content-Disposition", "attachment; filename="+ new String( "pushDataList.xls"));
			OutputStream os = response.getOutputStream();
			this.pushListWrite(os,datalist);
			this.pushListWrite(os,signFamilies);
		}catch (Exception ex){
			error(ex);
		}

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/main.jsp

@@ -138,9 +138,9 @@
							<sec:authorize url="/admin/static/pay/initial">
								<li><a href="javascript:locationMenu('staticPay');">支付统计报表</a></li>
							</sec:authorize>
							<sec:authorize url="/admin/static/healthedu/initial">
								<li><a href="javascript:locationMenu('healthEdu');">健教推送报表</a></li>
							</sec:authorize>
							<%--<sec:authorize url="/admin/static/healthedu/initial">--%>
								<%--<li><a href="javascript:locationMenu('healthEdu');">健教推送报表</a></li>--%>
							<%--</sec:authorize>--%>
							<sec:authorize url="/admin/static/center">
						</ul>
					</div>

patient-co-service/wlyy_sign/pom.xml

@@ -128,12 +128,12 @@
        <dependency>
            <groupId>com.zoesoft</groupId>
            <artifactId>phip-ssp-sdk</artifactId>
            <version>1.0.1</version>
            <version>1.4.0</version>
        </dependency>
        <dependency>
            <groupId>com.zoesoft</groupId>
            <artifactId>zoe-crypto</artifactId>
            <version>1.0-PK</version>
            <version>1.4.0</version>
        </dependency>
        <!-- 智业接口引用 END -->

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/booking/PatientBookingController.java

@@ -133,7 +133,7 @@ public class PatientBookingController extends WeixinBaseController{
                    json.put("toUser", p.getCode());
                    json.put("represented",p.getCode());//被代理人
                    json.put("name", obj.getName());
                    json.put("date", obj.getStartTime());
                    json.put("date", DateUtil.dateToStrLong(obj.getStartTime()));
                    json.put("doctorName", obj.getDoctorName());
                    json.put("orgName", obj.getOrgName());
//                    json.put("remark", obj.getName() + "，您好！\n您已取消了" + obj.getStartTime() + "的挂号！");

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/gateway/controller/express/LuyanExpressApiController.java

@@ -0,0 +1,44 @@
package com.yihu.wlyy.web.third.gateway.controller.express;
import com.yihu.wlyy.aop.ObserverRequired;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
 * 提供给鹭燕物流调用的接口
 * @author huangwenjie
 * @date 2018/3/26 14:05
 */
@RestController
@RequestMapping(value = "/wlyygc/express/luyan")
@Api(description = "鹭燕物流相关接口")
public class LuyanExpressApiController extends BaseController {
	private static Logger logger = LoggerFactory.getLogger(LuyanExpressApiController.class);
	
	@RequestMapping(value="/routepushservice",method = RequestMethod.POST)
	@ApiOperation("接受顺丰推送过来的路由信息")
	@ObserverRequired
	public String SFRoutePushService (
			@ApiParam(name="prescriptionCode", value="处方编码") @RequestParam(value = "prescriptionCode",required = true) String prescriptionCode,
			@ApiParam(name="mailno", value="快递单号") @RequestParam(value = "mailno",required = true) String mailno,
			@ApiParam(name="routinfo", value="入参报文") @RequestParam(value = "routinfo",required = true) String routinfo){
		try {
			System.out.println(routinfo);
			return write(200, "查询成功！");
		}catch (Exception e){
			logger.error("接收路演大药房信息推送失败，入参JSON:"+routinfo);
			//日志文件中记录异常信息
			error(e);
			//返回接口异常信息处理结果
			return error(-1, "请求失败！");
		}
	}
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/zysoft/BookingController.java

@@ -346,7 +346,7 @@ public class BookingController extends WeixinBaseController {
                json.put("toUser", p.getCode());
                json.put("represented",p.getCode());//被代理人
                json.put("id", obj.getCode());
                json.put("date", obj.getStartTime());
                json.put("date", DateUtil.dateToStrLong(obj.getStartTime()));
                json.put("orgCode", obj.getOrgCode());
                json.put("orgName", obj.getOrgName());
                json.put("doctorName", obj.getDoctorName());
@@ -452,7 +452,7 @@ public class BookingController extends WeixinBaseController {
                    json.put("toUser", p.getCode());
                    json.put("represented",p.getCode());//被代理人
                    json.put("name", obj.getName());
                    json.put("date", obj.getStartTime());
                    json.put("date", DateUtil.dateToStrLong(obj.getStartTime()));
                    json.put("doctorName", obj.getDoctorName());
                    json.put("orgName", obj.getOrgName());
//                    json.put("remark", obj.getName() + "，您好！\n您已取消了" + obj.getStartTime() + "的挂号！");
@@ -544,7 +544,7 @@ public class BookingController extends WeixinBaseController {
    @RequestMapping(value = "CreateOrderByDoctor", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("(内网)转诊预约挂号")
    @ApiOperation("(内网)转诊预约挂号-医生代预约")
    public String CreateOrderByDoctor(@ApiParam(name = "hospitalId", value = "医院ID", defaultValue = "350211A1001")
                                      @RequestParam(value = "hospitalId", required = true) String hospitalId,
                                      @ApiParam(name = "hospitalName", value = "医院名称", defaultValue = "厦门大学附属第一医院")
@@ -618,7 +618,7 @@ public class BookingController extends WeixinBaseController {
                        json.put("toUser", patient);
                        json.put("represented",patient);//被代理人
                        json.put("id", orderCode);
                        json.put("date", obj.getStartTime());
                        json.put("date", DateUtil.dateToStrLong(obj.getStartTime()));
                        json.put("orgName", obj.getOrgName());
                        json.put("orgCode", obj.getOrgCode());
                        json.put("doctorName", obj.getDeptName());