Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

common/common-entity/src/main/java/com/yihu/wlyy/entity/patient/prescription/PrescriptionExpressage.java

@@ -61,6 +61,7 @@ public class PrescriptionExpressage extends IdEntity{
    private String acceptName;        //医院药品接收人名称
    private String acceptHospital;        //医院药品接收人名称
    private String acceptHospitalName;        //医院药品接收人名称
    private String acceptHospitalAddress;        //医院药品接收人名称
    private Date acceptTime;                //接收的时间
@@ -380,5 +381,11 @@ public class PrescriptionExpressage extends IdEntity{
        this.patientHospitalCode = patientHospitalCode;
    }
    public String getAcceptHospitalAddress() {
        return acceptHospitalAddress;
    }
    public void setAcceptHospitalAddress(String acceptHospitalAddress) {
        this.acceptHospitalAddress = acceptHospitalAddress;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/config/war/ServletInitializer.java

@@ -8,6 +8,11 @@ import org.springframework.boot.context.web.SpringBootServletInitializer;
 * Created by Administrator on 2016.10.14.
 */
public class ServletInitializer extends SpringBootServletInitializer {
    public ServletInitializer() {
        super();
        setRegisterErrorPageFilter(false); //报错不跳到错误页
    }
    @Override
    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
        return application.sources(Application.class);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionExpressageService.java

@@ -336,10 +336,18 @@ public class PrescriptionExpressageService {
        /**
         * 判断如果服务站和患者填写的服务站一致  那么就修改处方状态为送达服务站
         */
        if(prescriptionExpressage.getPatientHospitalCode().equals(hospital)){
        if(hospital.equals(prescriptionExpressage.getPatientHospitalCode())){
            Prescription prescription=prescriptionDao.findByCode(prescriptionCode);
            prescription.setStatus(PrescriptionLog.PrescriptionLogStatus.expressage2hospital.getValue());
            prescription.setExpressageTime(new Date());
            prescriptionExpressage.setAcceptCode(userCode);
            prescriptionExpressage.setAcceptName(userName);
            prescriptionExpressage.setAcceptMobile(mobile);
            prescriptionExpressage.setAcceptHospital(hospital);
            prescriptionExpressage.setAcceptHospitalName(hospitalName);
            prescriptionExpressage.setAcceptHospitalAddress(hospitalAddress);
            prescriptionExpressage.setAcceptTime(new Date());
        }
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/system/Icd10DictServcie.java

@@ -20,11 +20,11 @@ import java.util.*;
 */
@Service
public class Icd10DictServcie {
    private final String keyIcd10 = "wlyy:dict:idc:Icd10:";
    private final String keyHealthProblem = "wlyy:dict:idc:HealthProblem:";
    private final String keyDict2healthProblem = "wlyy:dict:idc:Icd10ToHealthProblem:";
    private final String keyHealthProblem2Dict = "wlyy:dict:idc:HealthProblemToIcd10:";
    private final String ok = "wlyy:dict:idc:init";
    private final String keyIcd10 = "wlyy:dict:icd:Icd10:";
    private final String keyHealthProblem = "wlyy:dict:icd:HealthProblem:";
    private final String keyDict2healthProblem = "wlyy:dict:icd:Icd10ToHealthProblem:";
    private final String keyHealthProblem2Dict = "wlyy:dict:icd:HealthProblemToIcd10:";
    private final String ok = "wlyy:dict:icd:init";
    @Autowired

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescription/PrescriptionCodeController.java

@@ -22,7 +22,7 @@ import java.util.Map;
 */
@RestController
@RequestMapping(value = "/doctor/prescriptionCode")
@Api(description = "医生端-长处方接口")
@Api(description = "医生端--长处方接口")
public class PrescriptionCodeController extends BaseController{

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescription/PrescriptionLogController.java

@@ -1,7 +1,10 @@
package com.yihu.wlyy.web.doctor.prescription;
import com.yihu.wlyy.entity.doctor.reply.DoctorQuickReply;
import com.yihu.wlyy.entity.patient.prescription.PrescriptionExpressageLog;
import com.yihu.wlyy.entity.patient.prescription.PrescriptionLog;
import com.yihu.wlyy.service.app.prescription.PrescriptionExpressageLogService;
import com.yihu.wlyy.service.app.prescription.PrescriptionExpressageService;
import com.yihu.wlyy.service.app.prescription.PrescriptionLogService;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
@@ -26,6 +29,9 @@ import java.util.List;
public class PrescriptionLogController extends BaseController {
    @Autowired
    private PrescriptionLogService prescriptionLogService;
    @Autowired
    private PrescriptionExpressageLogService prescriptionExpressageLogService;
    /**
     * 根据处方code获取处方流程
@@ -48,7 +54,6 @@ public class PrescriptionLogController extends BaseController {
                    PrescriptionLog.PrescriptionLogStatus.pay_success.getValue(),
                    PrescriptionLog.PrescriptionLogStatus.wait_expressage.getValue(),
                    PrescriptionLog.PrescriptionLogStatus.expressageing.getValue(),
                    PrescriptionLog.PrescriptionLogStatus.expressage2hospital.getValue(),
                    PrescriptionLog.PrescriptionLogStatus.finish.getValue()};
            List<PrescriptionLog> prescriptionLogs = prescriptionLogService.findPrescriptionLogsByPrescriptionCode(prescriptionCode, types);
            if (prescriptionLogs != null) {
@@ -82,6 +87,10 @@ public class PrescriptionLogController extends BaseController {
                    PrescriptionLog.PrescriptionLogStatus.expressage2hospital.getValue(),
                    PrescriptionLog.PrescriptionLogStatus.finish.getValue()};
            List<PrescriptionLog> prescriptionLogs = prescriptionLogService.findPrescriptionLogsByPrescriptionCode(prescriptionCode, types);
            List<PrescriptionExpressageLog> expressageLogs = prescriptionExpressageLogService.findByPrescriptionCode(prescriptionCode);
            if (prescriptionLogs != null) {
                return write(200, "获取处方流程成功", "data", new JSONArray(copyBeans(prescriptionLogs, "statusName", "createTime")));
            } else {

patient-co/patient-co-wlyy/src/main/resources/application.yml

@@ -1,6 +1,10 @@
server:
  port: 8080
  error:
    whitelabel:
      enabled: false
spring:
  datasource:
    wlyy:
@@ -98,7 +102,6 @@ spring:
server:
  server_url: http://ehr.yihu.com/wlyy/
im:
  im_list_get: http://172.19.103.88:3000/
  data_base_name: im_new