Trick 5 rokov pred
rodič
commit
fcefe03fb3

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

@ -1604,6 +1604,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            json.put("days",StringUtils.isNotBlank(info.getPostCount())?info.getPostCount():"1");
        }
        json.put("frequency",info.getFrequency());
        json.put("comm",info.getComm());
        //设置诊断
        setIcd10(json,Icd10);
@ -3905,4 +3906,14 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        }
        return entranceService.BS16010(doctorMappingDO.getMappingCode(),demoFlag);
    }
    /**
     *
     * @param name
     * @param hospital
     * @return
     */
    public List<WlyyHospitalSysDictDO> findByDict(String name,String hospital){
        return sysDictDao.findByHospitalAndDictNameOrderBySortAsc(hospital,name);
    }
}

+ 3 - 0
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/EntranceService.java

@ -867,6 +867,9 @@ public class EntranceService {
                if(StringUtils.isNotBlank(vo.getFrequency())){
                    sbs.append(" frequency=\""+vo.getFrequency()+ "\"");
                }
                if(StringUtils.isNotBlank(vo.getComm())){
                    sbs.append(" comm=\""+vo.getComm()+ "\"");
                }
                //检查检验
                /**
                 *  name;//(检查方法)',

+ 1 - 0
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/RegisterService.java

@ -253,6 +253,7 @@ public class RegisterService {
            sbs.append("<startNum>1</startNum></MsgInfo></ESBEntry>");
            resp = MqSdkUtil.putReqAndGetRespByQueryStr(sbs.toString(), fid);
            resp = MqSdkUtil.xml2jsonArrayRootRow(resp);
            logger.info(fid+" resp:"+resp);
        }
        return ConvertUtil.convertListEnvelopInRequest(resp);
    }

+ 14 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionInfoDO.java

@ -132,6 +132,11 @@ public class WlyyPrescriptionInfoDO extends UuidIdentityEntity {
     */
    private String postCount;
    /**
     * 中药用法
     */
    private String comm;
    @Column(name = "prescription_id")
    public String getPrescriptionId() {
@ -328,4 +333,13 @@ public class WlyyPrescriptionInfoDO extends UuidIdentityEntity {
    public void setPostCount(String postCount) {
        this.postCount = postCount;
    }
    @Column(name = "comm")
    public String getComm() {
        return comm;
    }
    public void setComm(String comm) {
        this.comm = comm;
    }
}

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

@ -319,6 +319,8 @@ public class BaseHospitalRequestMapping {
        public static final String getDoctorPreSign ="/getDoctorPreSign";
        public static final String getDoctorIntroduction ="/getDoctorIntroduction";
        public static final String findByDict ="/findByDict";
    }

+ 13 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyHisPrescriptionVO.java

@ -110,6 +110,11 @@ public class WlyyHisPrescriptionVO extends UuidIdentityVOWithOperator {
     */
    private String diagFive;
    /**
     * 中药用法
     */
    private String comm;
    private String parentCode;//检查检验父级节点code
//    private String code;//检查检验项目编码',
    private String name;//检查检验(检查方法)',
@ -427,4 +432,12 @@ public class WlyyHisPrescriptionVO extends UuidIdentityVOWithOperator {
    public void setParentCode(String parentCode) {
        this.parentCode = parentCode;
    }
    public String getComm() {
        return comm;
    }
    public void setComm(String comm) {
        this.comm = comm;
    }
}

+ 3 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyPrescriptionInfoVO.java

@ -144,6 +144,9 @@ public class WlyyPrescriptionInfoVO extends UuidIdentityVOWithOperator {
    private Integer del;
    private String comm;
    public String getPrescriptionId() {
        return prescriptionId;
    }

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

@ -742,4 +742,13 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                                            @RequestParam(value = "doctor",required = false) String doctor)throws Exception{
        return success(prescriptionService.getDoctorIntroduction(doctor));
    }
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.findByDict)
    @ApiOperation(value = "查询医院字典", notes = "查询医院字典")
    public ListEnvelop findByDict(@ApiParam(name = "name", value = "字典名称")
                                  @RequestParam(value = "name", required = true)String name,
                                  @ApiParam(name = "hospital", value = "医生code")
                                  @RequestParam(value = "hospital", required = true)String hospital) {
        return success(prescriptionService.findByDict(name,hospital));
    }
}