查询单挑就诊记录参数追加

src/main/java/com/yihu/wlyy/controller/MqSdkController.java

@@ -99,15 +99,19 @@ public class MqSdkController /*extends EnvelopRestEndpoint */{
    @GetMapping(value = "/BS30025")
    @ApiOperation(value = " 查询某个时间段的患者门诊就诊记录 V1.00")
    public String BS30025(@ApiParam(name = "patNo", value = "居民id")
                              @RequestParam(value = "patNo",required = false) String patNo,
                          @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 = "startTime", value = "开始时间")
                              @RequestParam(value = "startTime",required = false) String startTime,
                          @RequestParam(value = "startTime", required = false) String startTime,
                          @ApiParam(name = "endTime", value = "结束时间")
                              @RequestParam(value = "endTime",required = false) String endTime) {
                          @RequestParam(value = "endTime", required = false) String endTime) {
        try {
            String obj = "";
            if (!testProfiles) {
                obj = entranceService.BS30025(patNo,startTime,endTime);
                obj = entranceService.BS30025(patNo,admNo,registerSn,startTime,endTime);
            } else {
                obj = "[{\"PAT_NO\":\"P5616242-0  \",\"CARD_NO\":\"D40136791\",\"CARD_STAT\":\"旧卡停用\",\"OP_DATE\":\"2011-09-27 15:35:57\",\"CARD_TYPE\":\"2\",\"CARD_TYPE_NAME\":\"社保卡\",\"social_no\":\"350211198411053024\"},{\"PAT_NO\":\"P5616242-0  \",\"CARD_NO\":\"DA1872143\",\"CARD_STAT\":\"激活\",\"OP_DATE\":\"2014-07-25 08:46:40\",\"CARD_TYPE\":\"2\",\"CARD_TYPE_NAME\":\"社保卡\",\"social_no\":\"350211198411053024\"}]";
            }
@@ -422,7 +426,7 @@ public class MqSdkController /*extends EnvelopRestEndpoint */{
        try {
            String  obj="";
           obj= caService.callYYTServerService();
            System.out.println("obj=="+obj);
//            System.out.println("obj=="+obj);
        } catch (Exception e) {
            e.printStackTrace();
            return "";

src/main/java/com/yihu/wlyy/service/CAService.java

@@ -72,7 +72,9 @@ public class CAService {
            Map<String, String> params = new HashMap<>();
            params.put("ServerInfo", info_xml);
            params.put("RegMsg", reqmsg_xml);
            re = postCAServer(action, params);
            String urlString = "http://172.16.50.40:80/ZyXmyytRequestService/ZyXmyytRequestServiceWs.dll?Handler=ZyXmyytRequestServiceWsService";
            String namespace = "zysoft";
            re= WebserviceUtil.post(urlString,namespace,action,params);
            if (StringUtil.isEmpty(re)) {
                throw new Exception("返回为空！");
            } else {
@@ -86,14 +88,6 @@ public class CAService {
        return re;
    }
  /*  *
     * 银医通下载二次封装*/
    private String postCAServer(String api, Map<String,String> params) throws Exception
    {
        String urlString = "http://172.16.50.40:80/ZyXmyytRequestService/ZyXmyytRequestServiceWs.dll?Handler=ZyXmyytRequestServiceWsService";
        String namespace = "zysoft";
        return WebserviceUtil.post(urlString,namespace,api,params);
    }

src/main/java/com/yihu/wlyy/service/EntranceService.java

@@ -140,7 +140,7 @@ public class EntranceService {
     * @return
     * @throws Exception
     */
    public String BS30025(String PAT_NO,String startTime,String endTime) throws Exception {
    public String BS30025(String PAT_NO,String admNo,String registerSn,String startTime,String endTime) throws Exception {
        String fid=BS30025;
        StringBuffer sbs= new StringBuffer();
        //AccessControl ：用户、密码、服务id
@@ -152,6 +152,12 @@ public class EntranceService {
        if (StringUtils.isNotBlank(PAT_NO)) {
            sbs.append("<query compy=\"=\" item=\"PAT_NO\" splice=\"and\" value=\"'" + PAT_NO + "'\"/>");
        }
        if (StringUtils.isNotBlank(admNo)) {
            sbs.append("<query compy=\"=\" item=\"ADM_NO\" splice=\"and\" value=\"'" + admNo + "'\"/>");
        }
        if (StringUtils.isNotBlank(registerSn)) {
            sbs.append("<query compy=\"=\" item=\"REGISTER_SN\" splice=\"and\" value=\"'" + registerSn + "'\"/>");
        }
        if (StringUtils.isNotBlank(startTime)) {
            sbs.append("<query compy=\"&gt;=\" item=\"CON_DATE\" splice=\"and\" value=\"'" + startTime + "'\"/>");
        }
@@ -484,28 +490,29 @@ public class EntranceService {
     * @return
     * @throws Exception
     */
    public String guahao(String PAT_NO,String startTime,String endTime) throws Exception {
        String fid=BS30025;
        StringBuffer sbs= new StringBuffer();
    public String guahao(String patNo,String dept,String doctor) throws Exception {
        String fid = BS30025;
        StringBuffer sbs = new StringBuffer();
        //AccessControl ：用户、密码、服务id
        sbs.append("<ESBEntry><AccessControl><Fid>"+fid+"</Fid><UserName>JKZL</UserName><Password>123456</Password></AccessControl>");
        sbs.append("<ESBEntry><AccessControl><Fid>" + fid + "</Fid><UserName>JKZL</UserName><Password>123456</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>S60</SourceSysCode><TargetSysCode>S01</TargetSysCode></MessageHeader>");
        sbs.append("<MessageHeader><Fid>" + fid + "</Fid><MsgDate>" + DateUtil.dateToStr(new Date(), DateUtil.YYYY_MM_DD_HH_MM_SS) + "</MsgDate><SourceSysCode>S60</SourceSysCode><TargetSysCode>S01</TargetSysCode></MessageHeader>");
        //查询信息拼接
        sbs.append("<MsgInfo><onceFlag>1</onceFlag><startNum>1</startNum><endNum>50000</endNum><Msg/>");
        if (StringUtils.isNotBlank(PAT_NO)) {
            sbs.append("<query compy=\"=\" item=\"PAT_NO\" splice=\"and\" value=\"'" + PAT_NO + "'\"/>");
        if (StringUtils.isNotBlank(patNo)) {
            sbs.append("<query compy=\"=\" item=\"PAT_NO\" splice=\"and\" value=\"'" + patNo + "'\"/>");
        }
        if (StringUtils.isNotBlank(startTime)) {
            sbs.append("<query compy=\"&gt;=\" item=\"CON_DATE\" splice=\"and\" value=\"'" + startTime + "'\"/>");
        if (StringUtils.isNotBlank(dept)) {
            sbs.append("<query compy=\"=\" item=\"ADM_SPEC\" splice=\"and\" value=\"'" + dept + "'\"/>");
        }
        if (StringUtils.isNotBlank(endTime)) {
            sbs.append("<query compy=\"&lt;\" item=\"CON_DATE\" splice=\"and\" value=\"'" + endTime + "'\"/>");
        if (StringUtils.isNotBlank(doctor)) {
            sbs.append("<query compy=\"=\" item=\"CON_DOC\" splice=\"and\" value=\"'" + doctor + "'\"/>");
        }
        sbs.append("<query compy=\"in\" item=\"DISCHG_FLAG\" splice=\"and\" value=\"('0','1')\"/>");
        //查询信息结束
        sbs.append("</MsgInfo></ESBEntry>");
        String resp = MqSdkUtil.putReqAndGetRespByQueryStr(sbs.toString(), fid );
        resp= MqSdkUtil.xml2jsonArrayRootRow(resp);
        String resp = MqSdkUtil.putReqAndGetRespByQueryStr(sbs.toString(), fid);
        resp = MqSdkUtil.xml2jsonArrayRootRow(resp);
        return resp;
    }