Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

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

@@ -374,7 +374,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        }
        logger.info("findOutpatientList patNo " + patNo);
        List<WlyyOutpatientVO> wlyyOutpatientVOList  =  entranceService.BS30025(patNo, null, startTime, endTime, demoFlag,ksdm);
        if (StringUtils.isNoneBlank(ksdm)){
        /*if (StringUtils.isNoneBlank(ksdm)){
            if (!ksdm.equalsIgnoreCase("1500010")){
                List<WlyyOutpatientVO> wlyyOutpatientVOList1  =  entranceService.BS30025(patNo, null, startTime, endTime, demoFlag,"1500010");
                if (wlyyOutpatientVOList!=null&&wlyyOutpatientVOList.size()!=0){
@@ -391,7 +391,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    wlyyOutpatientVOList = wlyyOutpatientVOList1;
                }
            }
        }
        }*/
        return wlyyOutpatientVOList;
    }

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

@@ -384,7 +384,6 @@ public class EntranceService {
                                    String[] diagThree = jsonObjectBody.get("diag_three").toString().toString().split("&");
                                    String[] diagFour = jsonObjectBody.get("diag_four").toString().toString().split("&");
                                    String[] diagFive = jsonObjectBody.get("diag_five").toString().toString().split("&");
                                    if (null != icdName && icdName.length > 1 && !wlyyPrescriptionDiagnosisVOHashMap.containsKey(icdName[1].toString())) {
                                        //主诊断
                                        wlyyPrescriptionDiagnosisVO = initWlyyPrescriptionDiagnosisVO(realOrder, icdName[0].toString(), icdName[1].toString(), 1);
@@ -444,7 +443,20 @@ public class EntranceService {
                            }
                        }
                    }
                    wlyyPrescriptionVO.setDiagnosisVOs(wlyyPrescriptionDiagnosisVOS);
                    List<String> str = new ArrayList<>();
                    List<WlyyPrescriptionDiagnosisVO> diagnosisVOS = new ArrayList<>();
                    for (WlyyPrescriptionDiagnosisVO diagnosisVO:wlyyPrescriptionDiagnosisVOS){
                        if (str==null||str.size()==0){
                            str.add(diagnosisVO.getCode());
                            diagnosisVOS.add(diagnosisVO);
                        }else {
                           if (!str.contains(diagnosisVO.getCode())){
                               str.add(diagnosisVO.getCode());
                               diagnosisVOS.add(diagnosisVO);
                           }
                        }
                    }
                    wlyyPrescriptionVO.setDiagnosisVOs(diagnosisVOS);
                    wlyyPrescriptionVO.setInfoVOs(wlyyPrescriptionInfoVOS);
                }
                Collection<WlyyPrescriptionVO> wlyyPrescriptionVOCollection = wlyyPrescriptionVOMap.values();
@@ -658,7 +670,7 @@ public class EntranceService {
                sbs.append("<query compy=\"&lt;\" item=\"CON_DATE\" splice=\"and\" value=\"'" + endTime + "'\"/>");
            }
            if (StringUtils.isNotBlank(ksdm)) {
                sbs.append("<query compy=\"=\" item=\"ADM_SPEC\" splice=\"and\" value=\"'" + ksdm + "'\"/>");
          /*      sbs.append("<query compy=\"=\" item=\"ADM_SPEC\" splice=\"and\" value=\"'" + ksdm + "'\"/>");*/
                sbs.append("<query compy=\"=\" item=\"under_dept\" splice=\"and\" value=\"'" + ksdm + "'\"/>");
            }
            sbs.append("<query compy=\"\" item=\"icd_name\" splice=\"and\" value=\"is not null\"/>");
@@ -806,22 +818,28 @@ public class EntranceService {
            //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>10</endNum><Msg/>");
            sbs.append("<MsgInfo><endNum>10</endNum><Msg>");
            if (StringUtils.isNotBlank(charge_code)) {
                sbs.append("<query compy=\"=\" item=\"charge_code\" splice=\"and\" value=\"'" + charge_code + "'\"/>");
                sbs.append("and charge_code ='"+charge_code+"' ");
                /*sbs.append("<query compy=\"=\" item=\"charge_code\" splice=\"and\" value=\"'" + charge_code + "'\"/>");*/
            }
            if (StringUtils.isNotBlank(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("<query compy=\"like\" item=\"py_code2\" splice=\"and\" value=\"'%" + py_code + "%'\"/>");
                sbs.append("<query compy=\"like\" item=\"py_code3\" splice=\"and\" value=\"'%" + py_code + "%'\"/>");
                sbs.append(" and (py_code like '%"+py_code+"%'\n" +
                        "   or  py_code2  like '%"+py_code+"%'\n" +
                        "   or py_code3 like '%"+py_code+"%') ");
/*                sbs.append("<query compy=\"like\" item=\"py_code\" splice=\"and\" value=\"'%" + py_code + "%'\"/>");*/
/*                sbs.append("<query compy=\"like\" item=\"py_code2\" splice=\"OR\" value=\"'%" + py_code + "%'\"/>");
                sbs.append("<query compy=\"like\" item=\"py_code3\" splice=\"and\" value=\"'%" + py_code + "%'\"/>");*/
            }
            if (StringUtils.isNotBlank(stock_amount)) {
                sbs.append("<query compy=\"&gt;\" item=\"stock_amount\" splice=\"and\" value=\"'" + stock_amount + "'\"/>");
                sbs.append(" and stock_amount > '"+stock_amount+"'");
                /*sbs.append("<query compy=\"&gt;\" item=\"stock_amount\" splice=\"and\" value=\"'" + stock_amount + "'\"/>");*/
            }
            if (StringUtils.isNotBlank(win_no)) {
                sbs.append("<query compy=\"=\" item=\"win_no\" splice=\"and\" value=\"'" + win_no + "'\"/>");
                sbs.append(" and win_no ='"+win_no+"'");
                /*sbs.append("<query compy=\"=\" item=\"win_no\" splice=\"and\" value=\"'" + win_no + "'\"/>");*/
            }
          /*  if (StringUtils.isNotBlank(drugname)) {
                //用默认字符编码解码字符串。
@@ -838,12 +856,14 @@ public class EntranceService {
                    inSql += "'" + group + "'" + ",";
                }
                inSql = inSql.substring(0, inSql.length() - 1);
                sbs.append("<query compy=\"in\" item=\"group_no\" splice=\"and\" value=\"(" + inSql + ")\"/>");
                sbs.append(" and group_no in ("+inSql+") ");
         /*       sbs.append("<query compy=\"in\" item=\"group_no\" splice=\"and\" value=\"(" + inSql + ")\"/>");*/
            }
            if (StringUtils.isNotBlank(visible_flag)) {
                sbs.append("<query compy=\"=\" item=\"visible_flag\" splice=\"and\" value=\"'" + visible_flag + "'\"/>");
                sbs.append(" and visible_flag ='"+visible_flag+"' ");
                /*sbs.append("<query compy=\"=\" item=\"visible_flag\" splice=\"and\" value=\"'" + visible_flag + "'\"/>");*/
            }
            sbs.append("<startNum>1</startNum></MsgInfo></ESBEntry>");
            sbs.append("</Msg><startNum>1</startNum></MsgInfo></ESBEntry>");
            resp = MqSdkUtil.putReqAndGetRespByQueryStr(sbs.toString(), fid);
            resp = MqSdkUtil.xml2jsonArrayRootRow(resp);
            //logger.info(fid+" resp:"+resp);