Merge branch 'dev' of wangjun/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -8591,4 +8591,24 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
    public void updateHisStatusByOutpatientId(String outpatientId){
        outpatientDao.updateHisStatusById(outpatientId,1);
    }
    //更新患者的诊断记录
    public Envelop updatePatientDiagnosis(String outpatiendId,String icd10,String icd10Name){
       WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.findOne(outpatiendId);
        Envelop envelop = new Envelop();
       if (null!=wlyyOutpatientDO){
           if(StringUtils.isNotBlank(icd10)){
               wlyyOutpatientDO.setIcd10(icd10);
           }
           if(StringUtils.isNotBlank(icd10Name)){
               wlyyOutpatientDO.setIcd10Name(icd10Name);
           }
           outpatientDao.save(wlyyOutpatientDO);
           envelop.setMessage("添加成功");
           envelop.setStatus(200);
       }else {
           envelop.setMessage("无该患者门诊记录");
           envelop.setStatus(-1);
       }
       return envelop;
    }
}

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/XzzxEntranceService.java

@@ -3034,12 +3034,10 @@ public Map checkSyncHis(String IoFlag,String PayCardNo,String NullahNumber,Strin
    public String saveCheckInputInfo(String prescriptionId,String payType,String doctor,String patient,List<WlyyPrescriptionDiagnosisDO> diagnosisDOS,List<WlyyPrescriptionInfoDO> infos) throws Exception{
        JSONObject jsonObject = initEntranceParam(payType,doctor,patient,diagnosisDOS);
        String tjPrescriptionId = "";
        WlyyPrescriptionCheckDO wlyyPrescriptionCheckDO = new WlyyPrescriptionCheckDO();
        //如果重新审核药品 一定要把返回的orderNo的值拿到赋值到prescriptionId里
        if (StringUtils.isNotEmpty(prescriptionId)) {
            tjPrescriptionId = prescriptionId;
            jsonObject.put("PATIENT_PRES_ID",tjPrescriptionId);
            wlyyPrescriptionCheckDO = prescriptionCheckDao.findOne(prescriptionId);
        }
        if (null!=infos&&infos.size()>0) {
            String response = "";
@@ -3063,7 +3061,6 @@ public Map checkSyncHis(String IoFlag,String PayCardNo,String NullahNumber,Strin
                System.out.println("obj:"+obj);
                if (StringUtils.isNotBlank(obj)) {
                    returnJson = obj;
                    wlyyPrescriptionCheckDO.setStatus(9);
                    logger.info("返回到互联网医院的解析后的结果："+returnJson);
                    wlyyHttpLogDO.setDoctor(doctor);
                    wlyyHttpLogDO.setCreateTime(new Date());
@@ -3071,10 +3068,9 @@ public Map checkSyncHis(String IoFlag,String PayCardNo,String NullahNumber,Strin
                    wlyyHttpLogDO.setResponse(returnJson);
                    wlyyHttpLogDO.setName("saveCheckPrescription");
                } else {
                    returnJson = "保存成功";
                    wlyyPrescriptionCheckDO.setStatus(10);
                    returnJson = "保存失败";
                    logger.info(returnJson);
                    wlyyHttpLogDO.setCode("success");
                    wlyyHttpLogDO.setCode("failed");
                    wlyyHttpLogDO.setDoctor(doctor);
                    wlyyHttpLogDO.setCreateTime(new Date());
                    wlyyHttpLogDO.setRequest(infos + jsonObject.toString());
@@ -3100,11 +3096,9 @@ public Map checkSyncHis(String IoFlag,String PayCardNo,String NullahNumber,Strin
    public String deleteCheckInputInfo(String prescriptionId,String payType,String doctor,String patient,List<WlyyPrescriptionDiagnosisDO> diagnosisDOS) throws Exception{
        JSONObject jsonObject = initEntranceParam(payType,doctor,patient,diagnosisDOS);
        String tjPrescriptionId = "";
        WlyyPrescriptionCheckDO wlyyPrescriptionCheckDO = new WlyyPrescriptionCheckDO();
        //如果重新审核药品 一定要把返回的orderNo的值拿到赋值到prescriptionId里
        if (StringUtils.isNotEmpty(prescriptionId)){
            tjPrescriptionId = prescriptionId;
            wlyyPrescriptionCheckDO = prescriptionCheckDao.findOne(tjPrescriptionId);
            jsonObject.put("PATIENT_PRES_ID",tjPrescriptionId);
        }
        String response = "";
@@ -3123,7 +3117,6 @@ public Map checkSyncHis(String IoFlag,String PayCardNo,String NullahNumber,Strin
            String obj = object.getString("obj");
            System.out.println("obj:"+obj);
            if (StringUtils.isNotBlank(obj)) { ;
                wlyyPrescriptionCheckDO.setStatus(11);
                returnJson = obj;
                logger.info("返回到互联网医院的解析后的结果："+returnJson);
                wlyyHttpLogDO.setDoctor(doctor);
@@ -3134,7 +3127,6 @@ public Map checkSyncHis(String IoFlag,String PayCardNo,String NullahNumber,Strin
            } else {
                returnJson = "删除成功";
                logger.info(returnJson);
                wlyyPrescriptionCheckDO.setStatus(12);
                wlyyHttpLogDO.setCode("删除成功");
                wlyyHttpLogDO.setDoctor(doctor);
                wlyyHttpLogDO.setCreateTime(new Date());
@@ -3144,7 +3136,6 @@ public Map checkSyncHis(String IoFlag,String PayCardNo,String NullahNumber,Strin
            }
        } else {
            returnJson = "entranceUrl接口调用失败";
            wlyyPrescriptionCheckDO.setStatus(11);
            wlyyHttpLogDO.setCode("error");
            wlyyHttpLogDO.setDoctor(doctor);
            wlyyHttpLogDO.setCreateTime(new Date());
@@ -3153,8 +3144,6 @@ public Map checkSyncHis(String IoFlag,String PayCardNo,String NullahNumber,Strin
            wlyyHttpLogDO.setName("deleteCheckPrescription");
        }
        wlyyHttpLogDao.save(wlyyHttpLogDO);
        prescriptionCheckDao.save(wlyyPrescriptionCheckDO);
        wlyyPrescriptionCheckDO.setReason(returnJson);
        return returnJson;
    }

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -410,6 +410,8 @@ public class BaseHospitalRequestMapping {
        public static final String xzzxDeleteCheckInfo = "/xzzxDeleteCheckInfo";
        public static final String findDictByName = "/findDictByName";
        public static final String updatePatientDiagnosis = "/updatePatientDiagnosis";
        public static final String getJcmb="/getJcmb";
        public static final String getJymb="/getJymb";
        public static final String getTcxz="/getTcxz";

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -2168,4 +2168,17 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
        }
        return success(xzzxEntranceService.deleteCheckInputInfo(prescriptionOnly,payType,doctor,patient,wlyyPrescriptionDiagnosisDOS));
    }
    @PostMapping(value = BaseHospitalRequestMapping.Prescription.updatePatientDiagnosis)
    @ApiOperation(value = "更新患者诊断记录")
    public Envelop updatePatientDiagnosis(
            @ApiParam(name = "outpatientId", value = "outpatientId")
            @RequestParam(value = "outpatientId",defaultValue = "",required = true) String outpatientId,
            @ApiParam(name = "icd10", value = "诊断码")
            @RequestParam(value = "icd10",defaultValue = "") String icd10,
            @ApiParam(name = "icd10Name", value = "诊断名称")
            @RequestParam(value = "icd10Name",defaultValue = "") String icd10Name) throws Exception {
        return prescriptionService.updatePatientDiagnosis(outpatientId,icd10,icd10Name);
    }
}