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

@@ -669,7 +669,9 @@ public class EntranceService {
                sbs.append("<query compy=\"=\" item=\"charge_code\" splice=\"and\" value=\"'" + charge_code + "'\"/>");
            }
            if (StringUtils.isNotBlank(py_code)) {
                sbs.append("<query compy=\"=\" item=\"py_code\" splice=\"and\" value=\"'" + py_code + "'\"/>");
                py_code=py_code.toUpperCase();
                logger.info("py_code="+py_code);
                sbs.append("<query compy=\"like\" item=\"py_code\" splice=\"and\" value=\"'%" + py_code + "%'\"/>");
            }
            if (StringUtils.isNotBlank(stock_amount)) {
                sbs.append("<query compy=\"&gt;=\" item=\"stock_amount\" splice=\"and\" value=\"'" + stock_amount + "'\"/>");
@@ -712,7 +714,9 @@ public class EntranceService {
                sbs.append("<query compy=\"=\" item=\"supply_code\" splice=\"and\" value=\"'" + supply_code + "'\"/>");
            }
            if(StringUtils.isNotBlank(py_code)){
                sbs.append("<query compy=\"=\" item=\"py_code\" splice=\"and\" value=\"'"+py_code+"'\"/>");
                py_code=py_code.toUpperCase();
                logger.info("py_code="+py_code);
                sbs.append("<query compy=\"like\" item=\"py_code\" splice=\"and\" value=\"'%"+py_code+"%'\"/>");
            }
            sbs.append("<startNum>1</startNum></MsgInfo></ESBEntry>");
            resp = MqSdkUtil.putReqAndGetRespByQueryStr(sbs.toString(), fid);
@@ -1016,7 +1020,9 @@ public class EntranceService {
            //查询信息拼接
            sbs.append("<MsgInfo><endNum>1000</endNum><Msg/>");
            if (StringUtils.isNotBlank(py_code)) {
                sbs.append("<query compy=\"=\" item=\"py_code\" splice=\"and\" value=\"'" + py_code + "'\"/>");
                py_code=py_code.toUpperCase();
                logger.info("py_code="+py_code);
                sbs.append("<query compy=\"like\" item=\"py_code\" splice=\"and\" value=\"'%" + py_code + "%'\"/>");
            }
            sbs.append("<startNum>1</startNum></MsgInfo></ESBEntry>");
            resp = MqSdkUtil.putReqAndGetRespByQueryStr(sbs.toString(), fid);
@@ -1041,7 +1047,9 @@ public class EntranceService {
        //查询信息拼接
        sbs.append("<MsgInfo><endNum>1000</endNum><Msg/>");
        if(StringUtils.isNotBlank(py_code)){
            sbs.append("<query compy=\"=\" item=\"py_code\" splice=\"and\" value=\"'"+py_code+"'\"/>");
            py_code=py_code.toUpperCase();
            logger.info("py_code="+py_code);
            sbs.append("<query compy=\"like\" item=\"py_code\" splice=\"and\" value=\"'%"+py_code+"%'\"/>");
        }
        if(StringUtils.isNotBlank(win_no)){
            sbs.append("<query compy=\"=\" item=\"win_no\" splice=\"and\" value=\"'"+win_no+"'\"/>");
@@ -1509,12 +1517,12 @@ public class EntranceService {
                                doctorCode = null == jsonObjectBody.get("Emp_Code") ? "" : jsonObjectBody.get("Emp_Code").toString();
                                //根据医生及分部，获取医生号别
                                net.sf.json.JSONArray jsonArrayCharge = BS55010(winNo, doctorCode, null, false);
                                String chareType = "";
                                String chareType=null;
                                if(null!=jsonArrayCharge){
                                    for (Object objectCharge : jsonArrayCharge) {
                                        net.sf.json.JSONObject jsonObjectBodyCharge = (net.sf.json.JSONObject) objectCharge;
                                        if (null != jsonObjectBodyCharge) {
                                            chareType = null == jsonObjectBodyCharge.get("charge_type") ? "" : jsonObjectBodyCharge.get("charge_type").toString();
                                            chareType = null == jsonObjectBodyCharge.get("charge_type") ? null : jsonObjectBodyCharge.get("charge_type").toString();
                                        }
                                    }
                                }

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

@@ -70,7 +70,7 @@ public class MqSdkController extends EnvelopRestEndpoint {
            @RequestParam(value = "admNo",required = false) String admNo,
            @ApiParam(name = "realOrder", value = "处方号", required = false)
            @RequestParam(value = "realOrder",required = false) String realOrder) throws Exception {
        List<WlyyPrescriptionVO> obj = entranceService.BS16017(registerSn, patNo, admNo,realOrder, demoFlag);
        List<WlyyPrescriptionVO> obj = entranceService.BS16017(registerSn,realOrder, patNo, admNo, demoFlag);
        return success(obj);
    }