三院优化开发

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

@@ -368,8 +368,21 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
     * @return
     * @throws Exception
     */
    public JSONArray findIcd10(String pyCode) throws Exception {
        return dsyyEntranceService.findIcd10(pyCode);
    public JSONArray findIcd10(String pyCode,String flag) throws Exception {
        if (flag.equalsIgnoreCase("2")){
            String sql = "select code,name,py_code,d_code from dict_icd10 where 1=1 and flag ='"+flag+"' ";
            if (StringUtils.isNoneBlank(pyCode)){
                sql += " and (py_code like '%"+pyCode+"%' or name like '%"+pyCode+"%') ";
            }
            List<Map<String,Object>> mapList = jdbcTemplate.queryForList(sql);
            JSONArray array = new JSONArray();
            for (Map<String,Object> map:mapList){
                array.add(map);
            }
            return array;
        }else {
            return dsyyEntranceService.findIcd10(pyCode);
        }
    }
    /**

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

@@ -5363,6 +5363,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                if(dictDO==null||"0".equals(dictDO.getDictValue())){
                    //不发送
                    return;
                }else {
                    int i= dsyyPrescriptionService.SendSms(phone,content);
                    logger.info("phone="+phone+";content="+content+","+i);
                }
            }
            if(StringUtils.isNotBlank(phone)&&StringUtils.isNotBlank(content)){
@@ -5572,9 +5575,29 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                        return;
                    }
                }
                if (wxId.equalsIgnoreCase("xm_dsyy_wx")){
                    String content = "";
                    String phone = "";
                    if ("9".equals(type)) {
                        content = "患者"+outpatientDO.getConsumerName()+"取消了图文复诊，您无需再进行相关处理。";
                    }
                    if ("16".equals(type)) {
                        content = "患者"+outpatientDO.getConsumerName()+"取消了视频复诊，您无需再进行相关处理。";
                    }
                    if ("1".equals(type)) {
                        content = "患者"+outpatientDO.getConsumerName()+"取消了图文咨询，您无需再进行相关处理。";
                    }
                    if ("17".equals(type)) {
                        content = "患者"+outpatientDO.getConsumerName()+"取消了视频咨询，您无需再进行相关处理。";
                    }
                    if ("12".equals(type)) {
                        return;
                    }
                    sendSms(doctorDO.getMobile(),content,"2");
                }
                logger.info("patientCancel诊查费支付成功推送模板消息:outpatientId="+outpatientId);
                msgUrl="/ims-wx/index.html#/returnVisit/record?outpatientId="+outpatientId;
            }else if("systemCancelRemind".equalsIgnoreCase(titelType)){
                //超过24小时未接诊，系统取消
                WlyyHospitalSysDictDO hospitalSysDictDO = hospitalSysDictDao.findById("isCloseRefund").orElse(null);
@@ -9147,7 +9170,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    ykyyService.pushNotificationToYktPatient(patient.getYktId(), systemMessageDO.getTitle(), data.get("msg").toString());
                }
                if("xm_dsyy_wx".equalsIgnoreCase(wechatId)){
                    sendSms(patient.getMobile(),"医生您好，患者"+outpatient.getPatientName()+"向您发起了"+title+",请及时查看","2");
                    sendSms(patient.getMobile(),"医生您好，患者"+outpatient.getPatientName()+"向您发起了"+title+",请及时前往互联网医院查看并答复。","2");
                }
            } else if ("1".equals(outpatient.getOutpatientType()))  {        //在线复诊
                //1.图文 2.视频
@@ -9175,7 +9198,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                            }
                        }
                    }else  if("xm_dsyy_wx".equalsIgnoreCase(wechatId)){
                        sendSms(patient.getMobile(),"医生您好，患者"+outpatient.getPatientName()+"向您发起了图文问诊,请及时查看","2");
                        sendSms(patient.getMobile(),"医生您好，患者"+outpatient.getPatientName()+"向您发起了图文问诊,请及时前往互联网医院查看并答复。","2");
                    }
                } else {
                    systemMessageDO.setTitle("视频复诊预约成功");

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionDO.java

@@ -285,6 +285,38 @@ public class WlyyPrescriptionDO extends UuidIdentityEntity {
    private Date disableTime;
    private String diseaseCode;
    private String diseaseName;
    private String isDisease;
    @Column(name = "disease_code")
    public String getDiseaseCode() {
        return diseaseCode;
    }
    public void setDiseaseCode(String diseaseCode) {
        this.diseaseCode = diseaseCode;
    }
    @Column(name = "disease_name")
    public String getDiseaseName() {
        return diseaseName;
    }
    public void setDiseaseName(String diseaseName) {
        this.diseaseName = diseaseName;
    }
    @Column(name = "is_disease")
    public String getIsDisease() {
        return isDisease;
    }
    public void setIsDisease(String isDisease) {
        this.isDisease = isDisease;
    }
    @Column(name = "check_time")
    public Date getCheckTime() {

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyPrescriptionVO.java

@@ -400,6 +400,15 @@ public class WlyyPrescriptionVO extends UuidIdentityVOWithOperator {
    @ApiModelProperty(value = "单据号", example = "模块1")
    private String voucherNo;
    @ApiModelProperty(value = "特殊病种编码", example = "模块1")
    private String diseaseCode;
    @ApiModelProperty(value = "特殊病种名称", example = "模块1")
    private String diseaseName;
    @ApiModelProperty(value = "是否特殊病种", example = "模块1")
    private String isDisease;
    public String getVoucherNo() {
        return voucherNo;
    }

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

@@ -664,7 +664,9 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.getICD10)
    @ApiOperation(value = "获取ICD10诊断编码", notes = "获取ICD10诊断编码")
    public ListEnvelop getICD10(@ApiParam(name = "pyKey", value = "拼音关键字")
                                @RequestParam(value = "pyKey", required = false) String pyKey) throws Exception {
                                @RequestParam(value = "pyKey", required = false) String pyKey,
                                @ApiParam(name = "flag", value = "1是普通诊断2特殊病种")
                                @RequestParam(value = "flag", required = false) String flag) throws Exception {
        if (wxId.equalsIgnoreCase("xm_zsyy_wx")||demoFlag) {
            return success(prescriptionService.getICD10(pyKey));
        } else if (wxId.equalsIgnoreCase("xm_xzzx_wx")) {
@@ -674,7 +676,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
        } else if (wxId.equalsIgnoreCase("xm_hcyy_wx")) {
            return success(hcyyPrescriptionService.selectIcd10Dict(pyKey));
        } if (wxId.equalsIgnoreCase("xm_dsyy_wx")) {
            return success(dsyyPrescriptionService.findIcd10(pyKey));
            return success(dsyyPrescriptionService.findIcd10(pyKey,flag));
        }else {
            return ListEnvelop.getError("尚未开发！");
        }