门诊记录入参变更

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

@@ -165,7 +165,7 @@ public class EntranceService {
     * @return
     * @throws Exception
     */
    public JSONArray BS16017(String REGISTER_SN,String PAT_NO,String ADM_NO,boolean demoFlag) throws Exception {
    public JSONArray BS16017(String REGISTER_SN,String PAT_NO,String ADM_NO,String realOrder,boolean demoFlag) throws Exception {
        String fid=BS16017;
        String resp = "";
        if (demoFlag) {
@@ -187,6 +187,9 @@ public class EntranceService {
            if (StringUtils.isNotBlank(ADM_NO)) {
                sbs.append("<query compy=\"=\" item=\"ADM_NO\" splice=\"and\" value=\"'" + ADM_NO + "'\"/>");
            }
            if (StringUtils.isNotBlank(realOrder)) {
                sbs.append("<query compy=\"=\" item=\"real_order\" splice=\"and\" value=\"'" + realOrder + "'\"/>");
            }
            //查询信息结束
            sbs.append("<startNum>1</startNum></MsgInfo></ESBEntry>");
            resp = MqSdkUtil.putReqAndGetRespByQueryStr(sbs.toString(), fid);
@@ -397,7 +400,7 @@ public class EntranceService {
     * @return
     * @throws Exception
     */
    public JSONArray BS30025(String PAT_NO,String ADM_NO,String REGISTER_SN,String PAT_CARDNO,String social_no,boolean demoFlag) throws Exception {
    public JSONArray BS30025(String PAT_NO,String startTime,String endTime,boolean demoFlag) throws Exception {
        String fid=BS30025; String resp = "";
        if (demoFlag) {
            resp = getJosnFileResullt(fid);
@@ -412,17 +415,11 @@ public class EntranceService {
            if (StringUtils.isNotBlank(PAT_NO)) {
                sbs.append("<query compy=\"=\" item=\"PAT_NO\" splice=\"and\" value=\"'" + PAT_NO + "'\"/>");
            }
            if (StringUtils.isNotBlank(ADM_NO)) {
                sbs.append("<query compy=\"=\" item=\"ADM_NO\" splice=\"and\" value=\"'" + ADM_NO + "'\"/>");
            }
            if (StringUtils.isNotBlank(REGISTER_SN)) {
                sbs.append("<query compy=\"=\" item=\"REGISTER_SN\" splice=\"and\" value=\"'" + REGISTER_SN + "'\"/>");
            }
            if (StringUtils.isNotBlank(PAT_CARDNO)) {
                sbs.append("<query compy=\"=\" item=\"PAT_CARDNO\" splice=\"and\" value=\"'" + PAT_CARDNO + "'\"/>");
            if (StringUtils.isNotBlank(startTime)) {
                sbs.append("<query compy=\"&gt;=\" item=\"CON_DATE\" splice=\"and\" value=\"'" + startTime + "'\"/>");
            }
            if (StringUtils.isNotBlank(social_no)) {
                sbs.append("<query compy=\"=\" item=\"social_no\" splice=\"and\" value=\"'" + social_no + "'\"/>");
            if (StringUtils.isNotBlank(endTime)) {
                sbs.append("<query compy=\"&lt\" item=\"CON_DATE\" splice=\"and\" value=\"'" + endTime + "'\"/>");
            }
            //查询信息结束
            sbs.append("</MsgInfo></ESBEntry>");

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

@@ -67,8 +67,10 @@ public class MqSdkController extends EnvelopRestEndpoint {
            @ApiParam(name = "patNo", value = "病人id", required = false)
            @RequestParam(value = "patNo",required = false) String patNo,
            @ApiParam(name = "admNo", value = "住院唯一号", required = false)
            @RequestParam(value = "admNo",required = false) String admNo) throws Exception {
        JSONArray obj = entranceService.BS16017(registerSn, patNo, admNo, demoFlag);
            @RequestParam(value = "admNo",required = false) String admNo,
            @ApiParam(name = "realOrder", value = "处方号", required = false)
            @RequestParam(value = "realOrder",required = false) String realOrder) throws Exception {
        JSONArray obj = entranceService.BS16017(registerSn, patNo, admNo,realOrder, demoFlag);
        return success(obj);
    }
@@ -91,15 +93,11 @@ public class MqSdkController extends EnvelopRestEndpoint {
    @ApiOperation(value = " 查询某个时间段的患者门诊就诊记录 V1.00")
    public ListEnvelop BS30025(@ApiParam(name = "patNo", value = "居民id")
                          @RequestParam(value = "patNo",required = false) String patNo,
                          @ApiParam(name = "admNo", value = "就诊唯一号")
                          @RequestParam(value = "admNo",required = false) String admNo,
                          @ApiParam(name = "registerSn", value = "流水号（处方号）")
                          @RequestParam(value = "registerSn",required = false) String registerSn,
                          @ApiParam(name = "patCardNo", value = "卡号")
                          @RequestParam(value = "patCardNo",required = false) String patCardNo,
                          @ApiParam(name = "socialNo", value = "身份证号")
                          @RequestParam(value = "socialNo",required = false) String socialNo) throws Exception {
        JSONArray obj = entranceService.BS30025(patNo, admNo, registerSn, patCardNo, socialNo, demoFlag);
                          @ApiParam(name = "startTime", value = "开始时间")
                          @RequestParam(value = "startTime",required = false) String startTime,
                          @ApiParam(name = "endTime", value = "结束时间")
                          @RequestParam(value = "endTime",required = false) String endTime) throws Exception {
        JSONArray obj = entranceService.BS30025(patNo, startTime, endTime, demoFlag);
        return success(obj);
    }