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

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

@@ -82,6 +82,7 @@ public class EntranceService {
    private static String MS02013="MS02013";
    //医院频次字典表
    private static String MS30012="MS30012";
    private String orgCode="350211A1002";
    @Value("${hospital.mqUser}")
    private String mqUser;
@@ -1029,32 +1030,6 @@ public class EntranceService {
                hospitalDeptMappingDOS.add(hdmDo);
            }
       /*     hdmDo.setSerialNo(null==jsonObjectBody.get("Serial_No")?"":jsonObjectBody.get("Serial_No").toString());
            hdmDo.setDeptCode(null==jsonObjectBody.get("Dept_Code")?"":jsonObjectBody.get("Dept_Code").toString());
            hdmDo.setDeptName(null==jsonObjectBody.get("Dept_Name")?"":jsonObjectBody.get("Dept_Name").toString());
            hdmDo.setDeptAlias(null==jsonObjectBody.get("Dept_Alias")?"":jsonObjectBody.get("Dept_Alias").toString());
            hdmDo.setClinicAttr(null==jsonObjectBody.get("Clinic_Attr")?"":jsonObjectBody.get("Clinic_Attr").toString());
            hdmDo.setVisitAdmitFlag(null==jsonObjectBody.get("Visit_Admit_Flag")?"":jsonObjectBody.get("Visit_Admit_Flag").toString());
            hdmDo.setInternalAergeryFlag(null==jsonObjectBody.get("Internal_Sergery_Flag")?"":jsonObjectBody.get("Internal_Sergery_Flag").toString());
            hdmDo.setGraveDeptFlag(null==jsonObjectBody.get("Grave_Dept_Flag")?"":jsonObjectBody.get("Grave_Dept_Flag").toString());
            hdmDo.setConsultDeptFlag(null==jsonObjectBody.get("Consult_Dept_Flag")?"":jsonObjectBody.get("Consult_Dept_Flag").toString());
            hdmDo.setDeptType(null==jsonObjectBody.get("Dept_Type")?"":jsonObjectBody.get("Dept_Type").toString());
            hdmDo.setInputCode(null==jsonObjectBody.get("Input_Code")?"":jsonObjectBody.get("Input_Code").toString());
            hdmDo.setPinyinCode(null==jsonObjectBody.get("Pinyin_Code")?"":jsonObjectBody.get("Pinyin_Code").toString());
            hdmDo.setWubiCode(null==jsonObjectBody.get("Wubi_Code")?"":jsonObjectBody.get("Wubi_Code").toString());
            hdmDo.setLocation(null==jsonObjectBody.get("Location")?"":jsonObjectBody.get("Location").toString());
            hdmDo.setDisplaySequence(null==jsonObjectBody.get("Display_Sequence")?"":jsonObjectBody.get("Display_Sequence").toString());
            hdmDo.setOpenBedNum(null==jsonObjectBody.get("Open_Bed_Num")?"":jsonObjectBody.get("Open_Bed_Num").toString());
            hdmDo.setFatherDeptCode(null==jsonObjectBody.get("Father_Dept_Code")?"":jsonObjectBody.get("Father_Dept_Code").toString());
            hdmDo.setFatherDeptName(null==jsonObjectBody.get("Father_Dept_Name")?"":jsonObjectBody.get("Father_Dept_Name").toString());
            hdmDo.setDeptRemark(null==jsonObjectBody.get("Dept_Remark")?"":jsonObjectBody.get("Dept_Remark").toString());
            hdmDo.setDeptAgeLimit(null==jsonObjectBody.get("Dept_Age_Limit")?"":jsonObjectBody.get("Dept_Age_Limit").toString());
            hdmDo.setDeptTelNum(null==jsonObjectBody.get("Dept_Tel_Num")?"":jsonObjectBody.get("Dept_Tel_Num").toString());
            hdmDo.setDeptZipCode(null==jsonObjectBody.get("Dept_Zip_Code")?"":jsonObjectBody.get("Dept_Zip_Code").toString());
            hdmDo.setDeDlid(null==jsonObjectBody.get("De_Dlid")?"":jsonObjectBody.get("De_Dlid").toString());
            hdmDo.setDeLcid(null==jsonObjectBody.get("De_Lcid")?"":jsonObjectBody.get("De_Lcid").toString());
            hdmDo.setSource("1");*/
        }
        dictHospitalDeptDao.save(hospitalDeptMappingDOS);
@@ -1090,7 +1065,7 @@ public class EntranceService {
     * @throws Exception
     */
    public JSONArray MS30012(boolean demoFlag) throws Exception {
        String fid="MS30012";
        String fid= MS30012;
        String resp="";
        if (demoFlag) {
            resp = getJosnFileResullt(fid);
@@ -1954,4 +1929,165 @@ public class EntranceService {
        //System.out.println(a);
        output.close();
    }
    /**
     * 检查模板
     * @param bz_code
     * @param demoFlag
     * @return
     * @throws Exception
     */
    public JSONArray BS20030(String bz_code,boolean demoFlag) throws Exception {
        String fid="BS20030";
        String resp="";
        if (demoFlag) {
            resp = getJosnFileResullt(fid);
        } else {
            StringBuffer sbs = new StringBuffer();
            //AccessControl ：用户、密码、服务id
            sbs.append("<ESBEntry><AccessControl><Fid>" + fid + "</Fid><UserName>"+mqUser+"</UserName><Password>"+mqPwd+"</Password></AccessControl>");
            //MessageHeader ：固定值 消费方系统编号 S60,提供方系统编号 S01
            sbs.append("<MessageHeader><Fid>" + fid + "</Fid><MsgDate>" + DateUtil.dateToStr(new Date(), DateUtil.YYYY_MM_DD_HH_MM_SS) + "</MsgDate><SourceSysCode>"+sourceSysCode+"</SourceSysCode><TargetSysCode>"+targetSysCode+"</TargetSysCode></MessageHeader>");
            //查询信息拼接
            sbs.append("<MsgInfo><endNum>1000</endNum>");
            if(StringUtils.isNotBlank(bz_code)){
                sbs.append("<Msg>and bz_code = '"+bz_code+"'</Msg>");
            }else{
                sbs.append("<Msg/>");
            }
            sbs.append("<startNum>1</startNum></MsgInfo></ESBEntry>");
            resp = MqSdkUtil.putReqAndGetRespByQueryStr(sbs.toString(), fid);
            resp = MqSdkUtil.xml2jsonArrayRootRow(resp);
        }
        return ConvertUtil.convertListEnvelopInBodyRow(resp);
    }
    /**
     * S60线上复诊 BS25033检查模板接口
     * @param bz_code
     * @param demoFlag
     * @return
     * @throws Exception
     */
    public JSONArray BS25033(String bz_code,boolean demoFlag) throws Exception {
        String fid="BS25033";
        String resp="";
        if (demoFlag) {
            resp = getJosnFileResullt(fid);
        } else {
            StringBuffer sbs = new StringBuffer();
            //AccessControl ：用户、密码、服务id
            sbs.append("<ESBEntry><AccessControl><Fid>" + fid + "</Fid><UserName>"+mqUser+"</UserName><Password>"+mqPwd+"</Password></AccessControl>");
            //MessageHeader ：固定值 消费方系统编号 S60,提供方系统编号 S01
            sbs.append("<MessageHeader><Fid>" + fid + "</Fid><MsgDate>" + DateUtil.dateToStr(new Date(), DateUtil.YYYY_MM_DD_HH_MM_SS) + "</MsgDate><SourceSysCode>"+sourceSysCode+"</SourceSysCode><TargetSysCode>"+targetSysCode+"</TargetSysCode></MessageHeader>");
            //查询信息拼接
            sbs.append("<MsgInfo><endNum>1000</endNum>");
            if(StringUtils.isNotBlank(bz_code)){
                sbs.append("<Msg>and bz_code = '"+bz_code+"'</Msg>");
            }else{
                sbs.append("<Msg/>");
            }
            sbs.append("<startNum>1</startNum></MsgInfo></ESBEntry>");
            resp = MqSdkUtil.putReqAndGetRespByQueryStr(sbs.toString(), fid);
            resp = MqSdkUtil.xml2jsonArrayRootRow(resp);
        }
        return ConvertUtil.convertListEnvelopInBodyRow(resp);
    }
    /**
     * S60线上复诊 MS02015套餐子项目字典接口
     * @param child_code
     * @param demoFlag
     * @return
     * @throws Exception
     */
    public JSONArray MS02015(String child_code,boolean demoFlag) throws Exception {
        String fid="MS02015";
        String resp="";
        if (demoFlag) {
            resp = getJosnFileResullt(fid);
        } else {
            StringBuffer sbs = new StringBuffer();
            //AccessControl ：用户、密码、服务id
            sbs.append("<ESBEntry><AccessControl><Fid>" + fid + "</Fid><UserName>"+mqUser+"</UserName><Password>"+mqPwd+"</Password></AccessControl>");
            //MessageHeader ：固定值 消费方系统编号 S60,提供方系统编号 S01
            sbs.append("<MessageHeader><Fid>" + fid + "</Fid><MsgDate>" + DateUtil.dateToStr(new Date(), DateUtil.YYYY_MM_DD_HH_MM_SS) + "</MsgDate><SourceSysCode>"+sourceSysCode+"</SourceSysCode><TargetSysCode>"+targetSysCode+"</TargetSysCode></MessageHeader>");
            //查询信息拼接
            sbs.append("<MsgInfo><endNum>1000</endNum>");
            if(StringUtils.isNotBlank(child_code)){
                sbs.append("<Msg>and child_code = '"+child_code+"'</Msg>");
            }else{
                sbs.append("<Msg/>");
            }
            sbs.append("<startNum>1</startNum></MsgInfo></ESBEntry>");
            resp = MqSdkUtil.putReqAndGetRespByQueryStr(sbs.toString(), fid);
            resp = MqSdkUtil.xml2jsonArrayRootRow(resp);
        }
        return ConvertUtil.convertListEnvelopInBodyRow(resp);
    }
    /**
     * S60线上复诊 MS02017套餐选择接口
     * @param charge_code
     * @param demoFlag
     * @return
     * @throws Exception
     */
    public JSONArray MS02017(String charge_code,boolean demoFlag) throws Exception {
        String fid="MS02017";
        String resp="";
        if (demoFlag) {
            resp = getJosnFileResullt(fid);
        } else {
            StringBuffer sbs = new StringBuffer();
            //AccessControl ：用户、密码、服务id
            sbs.append("<ESBEntry><AccessControl><Fid>" + fid + "</Fid><UserName>"+mqUser+"</UserName><Password>"+mqPwd+"</Password></AccessControl>");
            //MessageHeader ：固定值 消费方系统编号 S60,提供方系统编号 S01
            sbs.append("<MessageHeader><Fid>" + fid + "</Fid><MsgDate>" + DateUtil.dateToStr(new Date(), DateUtil.YYYY_MM_DD_HH_MM_SS) + "</MsgDate><SourceSysCode>"+sourceSysCode+"</SourceSysCode><TargetSysCode>"+targetSysCode+"</TargetSysCode></MessageHeader>");
            //查询信息拼接
            sbs.append("<MsgInfo><endNum>1000</endNum>");
            if(StringUtils.isNotBlank(charge_code)){
                sbs.append("<Msg>and charge_code = '"+charge_code+"'</Msg>");
            }else{
                sbs.append("<Msg/>");
            }
            sbs.append("<startNum>1</startNum></MsgInfo></ESBEntry>");
            resp = MqSdkUtil.putReqAndGetRespByQueryStr(sbs.toString(), fid);
            resp = MqSdkUtil.xml2jsonArrayRootRow(resp);
        }
        return ConvertUtil.convertListEnvelopInBodyRow(resp);
    }
    /**
     * S60线上复诊 MS02016主项目绑定子项目字典接口
     * @param zd_charge_code
     * @param demoFlag
     * @return
     * @throws Exception
     */
    public JSONArray MS02016(String zd_charge_code,boolean demoFlag) throws Exception {
        String fid="MS02016";
        String resp="";
        if (demoFlag) {
            resp = getJosnFileResullt(fid);
        } else {
            StringBuffer sbs = new StringBuffer();
            //AccessControl ：用户、密码、服务id
            sbs.append("<ESBEntry><AccessControl><Fid>" + fid + "</Fid><UserName>"+mqUser+"</UserName><Password>"+mqPwd+"</Password></AccessControl>");
            //MessageHeader ：固定值 消费方系统编号 S60,提供方系统编号 S01
            sbs.append("<MessageHeader><Fid>" + fid + "</Fid><MsgDate>" + DateUtil.dateToStr(new Date(), DateUtil.YYYY_MM_DD_HH_MM_SS) + "</MsgDate><SourceSysCode>"+sourceSysCode+"</SourceSysCode><TargetSysCode>"+targetSysCode+"</TargetSysCode></MessageHeader>");
            //查询信息拼接
            sbs.append("<MsgInfo><endNum>1000</endNum>");
            if(StringUtils.isNotBlank(zd_charge_code)){
                sbs.append("<Msg>and zd_charge_code = '"+zd_charge_code+"'</Msg>");
            }else{
                sbs.append("<Msg/>");
            }
            sbs.append("<startNum>1</startNum></MsgInfo></ESBEntry>");
            resp = MqSdkUtil.putReqAndGetRespByQueryStr(sbs.toString(), fid);
            resp = MqSdkUtil.xml2jsonArrayRootRow(resp);
        }
        return ConvertUtil.convertListEnvelopInBodyRow(resp);
    }
}

business/base-service/src/mqConfig/esbmq-config.xml

@@ -65,6 +65,17 @@
				<BS16011_1>EwellQ.S60.BS16011.GET</BS16011_1>
				<MS02014_0>EwellQ.S60.MS02014.PUT</MS02014_0>
				<MS02014_1>EwellQ.S60.MS02014.GET</MS02014_1>
				<BS20030_0>EwellQ.S60.BS20030.PUT</BS20030_0>
				<BS20030_1>EwellQ.S60.BS20030.GET</BS20030_1>
				<BS25033_0>EwellQ.S60.BS25033.PUT</BS25033_0>
				<BS25033_1>EwellQ.S60.BS25033.GET</BS25033_1>
				<MS02015_0>EwellQ.S60.MS02015.PUT</MS02015_0>
				<MS02015_1>EwellQ.S60.MS02015.GET</MS02015_1>
				<MS02016_0>EwellQ.S60.MS02016.PUT</MS02016_0>
				<MS02016_1>EwellQ.S60.MS02016.GET</MS02016_1>
				<MS02017_0>EwellQ.S60.MS02017.PUT</MS02017_0>
				<MS02017_1>EwellQ.S60.MS02017.GET</MS02017_1>
			</QUEUES>
		</QMGR.S60>
	</MQCONFIG>

svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/MqSdkController.java

@@ -416,5 +416,47 @@ public class MqSdkController extends EnvelopRestEndpoint {
        return success(obj);
    }
    @GetMapping(value = "/BS20030")
    @ApiOperation(value = "检验模板接口")
    public ObjEnvelop BS20030(@ApiParam(name = "bz_code", value = "入参条件为第一节点代码")
                              @RequestParam(value = "bz_code",defaultValue = "") String bz_code) throws Exception {
        JSON obj = entranceService.BS20030(bz_code,demoFlag);
        return success(obj);
    }
    @GetMapping(value = "/BS25033")
    @ApiOperation(value = "BS25033检查模板接口")
    public ObjEnvelop BS25033(
            @ApiParam(name = "bz_code", value = "入参条件为第一节点代码")
            @RequestParam(value = "bz_code",defaultValue = "") String bz_code) throws Exception {
        JSON obj = entranceService.BS25033(bz_code,demoFlag);
        return success(obj);
    }
    @GetMapping(value = "/MS02015套餐子项目字典接口")
    @ApiOperation(value = "MS02015套餐子项目字典接口")
    public ObjEnvelop MS02015(
            @ApiParam(name = "child_code", value = "入参条件为子项目编码")
            @RequestParam(value = "child_code",defaultValue = "") String child_code) throws Exception {
        JSON obj = entranceService.MS02015(child_code,demoFlag);
        return success(obj);
    }
    @GetMapping(value = "/MS02016")
    @ApiOperation(value = "MS02016主项目绑定子项目字典接口")
    public ObjEnvelop MS02016(
            @ApiParam(name = "zd_charge_code", value = "入参条件为项目代码")
            @RequestParam(value = "zd_charge_code",defaultValue = "") String zd_charge_code) throws Exception {
        JSON obj = entranceService.MS02016(zd_charge_code,demoFlag);
        return success(obj);
    }
    @GetMapping(value = "/MS02017")
    @ApiOperation(value = "MS02017套餐选择接口")
    public ObjEnvelop MS02017(
            @ApiParam(name = "charge_code", value = "入参条件为收费项目代码")
            @RequestParam(value = "charge_code",defaultValue = "") String charge_code) throws Exception {
        JSON obj = entranceService.MS02017(charge_code,demoFlag);
        return success(obj);
    }
}

svr/svr-internet-hospital-entrance/src/mqConfig/esbmq-config.xml

@@ -58,6 +58,19 @@
				<BS16010_1>EwellQ.S60.BS16010.GET</BS16010_1>
				<BS16011_0>EwellQ.S60.BS16011.PUT</BS16011_0>
				<BS16011_1>EwellQ.S60.BS16011.GET</BS16011_1>
				<MS02014_0>EwellQ.S60.MS02014.PUT</MS02014_0>
				<MS02014_1>EwellQ.S60.MS02014.GET</MS02014_1>
				<BS20030_0>EwellQ.S60.BS20030.PUT</BS20030_0>
				<BS20030_1>EwellQ.S60.BS20030.GET</BS20030_1>
				<BS25033_0>EwellQ.S60.BS25033.PUT</BS25033_0>
				<BS25033_1>EwellQ.S60.BS25033.GET</BS25033_1>
				<MS02015_0>EwellQ.S60.MS02015.PUT</MS02015_0>
				<MS02015_1>EwellQ.S60.MS02015.GET</MS02015_1>
				<MS02016_0>EwellQ.S60.MS02016.PUT</MS02016_0>
				<MS02016_1>EwellQ.S60.MS02016.GET</MS02016_1>
				<MS02017_0>EwellQ.S60.MS02017.PUT</MS02017_0>
				<MS02017_1>EwellQ.S60.MS02017.GET</MS02017_1>
			</QUEUES>
		</QMGR.S60>
	</MQCONFIG>