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

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

@@ -1162,8 +1162,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
     * @return
     * @throws Exception
     */
    public JSONArray getJcmb(String bz_code,String flag)throws Exception{
        return entranceService.BS25033(bz_code,flag,demoFlag);
    public JSONArray getJcmb(String bz_code,String tc_no,String flag)throws Exception{
        return entranceService.BS25033(bz_code,tc_no,flag,demoFlag);
    }
@@ -1174,8 +1174,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
     * @return
     * @throws Exception
     */
    public JSONArray getJymb(String bz_code,String flag)throws Exception{
        return entranceService.BS20030(bz_code,flag,demoFlag);
    public JSONArray getJymb(String bz_code,String tc_no,String flag)throws Exception{
        return entranceService.BS20030(bz_code,tc_no,flag,demoFlag);
    }
    /**
@@ -1185,8 +1185,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
     * @return
     * @throws Exception
     */
    public JSONArray getTcxz(String bz_code,String flag)throws Exception{
        return entranceService.MS02017(bz_code,flag,demoFlag);
    public JSONArray getTcxz(String bz_code,String tc_no,String flag)throws Exception{
        return entranceService.MS02017(bz_code,tc_no,flag,demoFlag);
    }

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

@@ -1950,7 +1950,7 @@ public class EntranceService {
     * @return
     * @throws Exception
     */
    public JSONArray BS20030(String bz_code,String flag,boolean demoFlag) throws Exception {
    public JSONArray BS20030(String bz_code,String tc_no,String flag,boolean demoFlag) throws Exception {
        String fid="BS20030";
        String resp="";
        if (demoFlag) {
@@ -1963,8 +1963,15 @@ public class EntranceService {
            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>");
            if(StringUtils.isNotBlank(bz_code)||StringUtils.isNotBlank(tc_no)){
                sbs.append("<Msg>");
                if(StringUtils.isNotBlank(bz_code)){
                    sbs.append(" and bz_code = '"+bz_code+"' ");
                }
                if(StringUtils.isNotBlank(tc_no)){
                    sbs.append(" and tc_no = '"+tc_no+"' ");
                }
                sbs.append("</Msg>");
            }else{
                sbs.append("<Msg/>");
            }
@@ -1983,7 +1990,7 @@ public class EntranceService {
     * @return
     * @throws Exception
     */
    public JSONArray BS25033(String bz_code,String flag,boolean demoFlag) throws Exception {
    public JSONArray BS25033(String bz_code,String tc_no,String flag,boolean demoFlag) throws Exception {
        String fid="BS25033";
        String resp="";
        if (demoFlag) {
@@ -1996,8 +2003,15 @@ public class EntranceService {
            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>");
            if(StringUtils.isNotBlank(bz_code)||StringUtils.isNotBlank(tc_no)){
                sbs.append("<Msg>");
                if(StringUtils.isNotBlank(bz_code)){
                    sbs.append(" and bz_code = '"+bz_code+"' ");
                }
                if(StringUtils.isNotBlank(tc_no)){
                    sbs.append(" and tc_no = '"+tc_no+"' ");
                }
                sbs.append("</Msg>");
            }else{
                sbs.append("<Msg/>");
            }
@@ -2048,7 +2062,7 @@ public class EntranceService {
     * @return
     * @throws Exception
     */
    public JSONArray MS02017(String bz_code,String flag,boolean demoFlag) throws Exception {
    public JSONArray MS02017(String bz_code,String tc_no,String flag,boolean demoFlag) throws Exception {
        String fid="MS02017";
        String resp="";
        if (demoFlag) {
@@ -2061,8 +2075,15 @@ public class EntranceService {
            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>");
            if(StringUtils.isNotBlank(bz_code)||StringUtils.isNotBlank(tc_no)){
                sbs.append("<Msg>");
                if(StringUtils.isNotBlank(bz_code)){
                    sbs.append(" and bz_code = '"+bz_code+"' ");
                }
                if(StringUtils.isNotBlank(tc_no)){
                    sbs.append(" and tc_no = '"+tc_no+"' ");
                }
                sbs.append("</Msg>");
            }else{
                sbs.append("<Msg/>");
            }

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

@@ -422,9 +422,11 @@ public class MqSdkController extends EnvelopRestEndpoint {
    @ApiOperation(value = "检验模板接口")
    public ObjEnvelop BS20030(@ApiParam(name = "bz_code", value = "入参条件为第一节点代码")
                              @RequestParam(value = "bz_code",defaultValue = "") String bz_code,
                              @ApiParam(name = "flag", value = "入参条件为第一节点代码")
                              @RequestParam(value = "flag",defaultValue = "1获取所有一级节点,2二级，3为具体信息") String flag) throws Exception {
        JSON obj = entranceService.BS20030(bz_code,flag,demoFlag);
                              @ApiParam(name = "tc_no", value = "二级节点代码")
                              @RequestParam(value = "tc_no",defaultValue = "") String tc_no,
                              @ApiParam(name = "flag", value = "1一级，2二级，3三级")
                              @RequestParam(value = "flag",defaultValue = "1") String flag) throws Exception {
        JSON obj = entranceService.BS20030(bz_code,tc_no,flag,demoFlag);
        return success(obj);
    }
@@ -433,9 +435,11 @@ public class MqSdkController extends EnvelopRestEndpoint {
    public ObjEnvelop BS25033(
            @ApiParam(name = "bz_code", value = "入参条件为第一节点代码")
            @RequestParam(value = "bz_code",defaultValue = "") String bz_code,
            @ApiParam(name = "flag", value = "入参条件为第一节点代码")
            @RequestParam(value = "flag",defaultValue = "1获取所有一级节点,2二级，3为具体信息") String flag) throws Exception {
        JSON obj = entranceService.BS25033(bz_code,flag,demoFlag);
            @ApiParam(name = "tc_no", value = "二级节点代码")
            @RequestParam(value = "tc_no",defaultValue = "") String tc_no,
            @ApiParam(name = "flag", value = "1一级，2二级，3三级")
            @RequestParam(value = "flag",defaultValue = "1") String flag) throws Exception {
        JSON obj = entranceService.BS25033(bz_code,tc_no,flag,demoFlag);
        return success(obj);
    }
@@ -460,11 +464,13 @@ public class MqSdkController extends EnvelopRestEndpoint {
    @GetMapping(value = "/MS02017")
    @ApiOperation(value = "MS02017套餐选择接口")
    public ObjEnvelop MS02017(
            @ApiParam(name = "bz_code", value = "入参条件为收费项目代码")
            @ApiParam(name = "bz_code", value = "一级节点代码")
            @RequestParam(value = "bz_code",defaultValue = "") String charge_code,
            @ApiParam(name = "flag", value = "入参条件为第一节点代码")
            @RequestParam(value = "flag",defaultValue = "1获取所有一级节点,2二级，3为具体信息") String flag) throws Exception {
        JSON obj = entranceService.MS02017(charge_code,flag,demoFlag);
            @ApiParam(name = "tc_no", value = "二级节点代码")
            @RequestParam(value = "tc_no",defaultValue = "") String tc_no,
            @ApiParam(name = "flag", value = "1一级，2二级，3三级")
            @RequestParam(value = "flag",defaultValue = "1") String flag) throws Exception {
        JSON obj = entranceService.MS02017(charge_code,tc_no,flag,demoFlag);
        return success(obj);
    }
}

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

@@ -277,7 +277,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = BaseHospitalRequestMapping.Prescription.makeDiagnosis)
    @ApiOperation(value = "下诊断", notes = "下诊断")
    @ApiOperation(value = "下诊断", notes = "下诊断接口")
    public ObjEnvelop makeDiagnosis(@ApiParam(name = "outPatientId", value = "门诊编号")
                                            @RequestParam(value = "outPatientId", required = true)String outPatientId,
                                            @ApiParam(name = "advice", value = "医嘱")
@@ -675,10 +675,12 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.getJymb)
    @ApiOperation(value = "检验模板接口")
    public ListEnvelop getJymb(@ApiParam(name = "bz_code", value = "入参条件为第一节点代码")
                              @RequestParam(value = "bz_code",defaultValue = "") String bz_code,
                              @ApiParam(name = "flag", value = "入参条件为第一节点代码")
                              @RequestParam(value = "flag",defaultValue = "1获取所有一级节点,2二级，3为具体信息") String flag) throws Exception {
        return success(prescriptionService.getJymb(bz_code,flag));
                               @RequestParam(value = "bz_code",defaultValue = "") String bz_code,
                               @ApiParam(name = "tc_no", value = "二级节点代码")
                               @RequestParam(value = "tc_no",defaultValue = "") String tc_no,
                               @ApiParam(name = "flag", value = "入参条件为第一节点代码")
                               @RequestParam(value = "flag",defaultValue = "1") String flag) throws Exception {
        return success(prescriptionService.getJymb(bz_code,tc_no,flag));
    }
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.getJcmb)
@@ -686,9 +688,11 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    public ListEnvelop getJcmb(
            @ApiParam(name = "bz_code", value = "入参条件为第一节点代码")
            @RequestParam(value = "bz_code",defaultValue = "") String bz_code,
            @ApiParam(name = "tc_no", value = "二级节点代码")
            @RequestParam(value = "tc_no",defaultValue = "") String tc_no,
            @ApiParam(name = "flag", value = "入参条件为第一节点代码")
            @RequestParam(value = "flag",defaultValue = "1获取所有一级节点,2二级，3为具体信息") String flag) throws Exception {
        return success(prescriptionService.getJcmb(bz_code,flag));
            @RequestParam(value = "flag",defaultValue = "1") String flag) throws Exception {
        return success(prescriptionService.getJcmb(bz_code,tc_no,flag));
    }
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.getTcChild)
@@ -712,9 +716,10 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    public ListEnvelop getTcxz(
            @ApiParam(name = "bz_code", value = "入参条件为收费项目代码")
            @RequestParam(value = "bz_code",defaultValue = "") String charge_code,
            @ApiParam(name = "tc_no", value = "二级节点代码")
            @RequestParam(value = "tc_no",defaultValue = "") String tc_no,
            @ApiParam(name = "flag", value = "入参条件为第一节点代码")
            @RequestParam(value = "flag",defaultValue = "1获取所有一级节点,2二级，3为具体信息") String flag) throws Exception {
        prescriptionService.getTcxz(charge_code,flag);
        return success(prescriptionService.getTcxz(charge_code,flag));
            @RequestParam(value = "flag",defaultValue = "1") String flag) throws Exception {
        return success(prescriptionService.getTcxz(charge_code,tc_no,flag));
    }
}