1

aipt-service/src/main/java/com/diagbot/vo/SearchVo.java

@@ -25,7 +25,7 @@ public class SearchVo {
     //特征类别
     private String featureType;
     private String symptom;
-    private String past;
+    private String pasts;
     private String other;
     private String vital;
     @ApiModelProperty(hidden = true)

config-server/src/main/resources/shared/aipt-service-local.yml

@@ -99,8 +99,8 @@ io.github.lvyahui8.spring.base-packages: com.diagbot.aggregate
 
 ai:
   server:
-    address: http://127.0.0.1:5008
+    address: http://192.1.3.116:5008
 
 nlp:
   server:
-    address: http://127.0.0.1:5002
+    address: http://192.1.3.116:5002

data-service/src/main/java/com/diagbot/client/bean/SearchData.java

@@ -20,7 +20,7 @@ public class SearchData {
     //外部系统编码 用于返回映射数据，如果sysCode为空或null，则返回kl_standard_info标准名称
     private String sysCode;
     private String symptom;
-    private String past;
+    private String pasts;
     private String other;
     private String vital;
     private String lis;

data-service/src/main/java/com/diagbot/facade/AssembleFacade.java

@@ -31,7 +31,7 @@ public class AssembleFacade {
         searchData.setVital(pushVO.getVital());
         searchData.setLis(pushVO.getLisString());
         searchData.setPacs(pushVO.getPacs());
-        searchData.setPast(pushVO.getPast());
+        searchData.setPasts(pushVO.getPasts());
         searchData.setOther(pushVO.getOther());
         searchData.setDiag(pushVO.getDiag());
         searchData.setDisType(pushVO.getDisType());

data-service/src/main/java/com/diagbot/vo/PushBaseVO.java

@@ -29,6 +29,6 @@ public class PushBaseVO {
     private List<LisResult> lis;
     private String pacs;
     @ApiModelProperty(hidden = true)
-    private String past;
+    private String pasts;
     private String other;
 }

data-service/src/main/java/com/diagbot/vo/PushJoinVO.java

@@ -27,7 +27,7 @@ public class PushJoinVO {
     private List<LisResult> lis;
     private String pacs;
     @ApiModelProperty(hidden = true)
-    private String past;
+    private String pasts;
     private String other;
     //不能分类文本
     private String unknown;

tran-service/src/main/java/com/diagbot/vo/PushJoinVO.java

@@ -29,7 +29,7 @@ public class PushJoinVO {
     private List<PacsResult> pacsList;
     private String pacs;
     @ApiModelProperty(hidden = true)
-    private String past;
+    private String pasts;
     private String other;
     //不能分类文本
     private String unknown;

tran-service/src/main/java/com/diagbot/web/InquiryInfoController.java

@@ -255,10 +255,6 @@ public class InquiryInfoController {
             pushJoinVO.setDiag("");
         }
         GetDiseaseNameVO getDiseaseNameVO = new GetDiseaseNameVO();
-        LisPacsInfoForDJVO lisPacsInfoForDJVO = new LisPacsInfoForDJVO();
-        List<LisConfigDTO> lisConfigDTO;
-        List<LisConfigDTO> lisConfigDTO1;
-        List<PacsConfigDTO> pacsConfigDTO;
         List<GetDiseaseNameDTO> a;
         String mrId;
         String url;
@@ -299,6 +295,8 @@ public class InquiryInfoController {
         //结构化验转公表
         List<LisResult> lrs = pushJoinVO.getLis();
         if (lrs != null && lrs.size() != 0) {
+            LisPacsInfoForDJVO lisPacsInfoForDJVO = new LisPacsInfoForDJVO();
+            List<LisConfigDTO> lisConfigDTO;
             for (int i = 0; i < lrs.size(); i++) {
                 lisPacsInfoForDJVO.setHosCode(pushJoinVO.getHosCode());
                 lisPacsInfoForDJVO.setMealName(lrs.get(i).getName());
@@ -314,6 +312,8 @@ public class InquiryInfoController {
         //结构辅检转公表
         List<PacsResult> lpr = pushJoinVO.getPacsList();
         if (lpr != null && lpr.size() != 0) {
+            LisPacsInfoForDJVO lisPacsInfoForDJVO = new LisPacsInfoForDJVO();
+            List<PacsConfigDTO> pacsConfigDTO;
             for (int j = 0; j < lpr.size(); j++) {
                 lisPacsInfoForDJVO.setHosCode(pushJoinVO.getHosCode());
                 lisPacsInfoForDJVO.setMealName(lpr.get(j).getName());
@@ -327,50 +327,137 @@ public class InquiryInfoController {
         }
 
         //化验套餐名转公表
-        if (pushJoinVO.getLisOrderCode() != null && !"".equals(pushJoinVO.getLisOrderCode().trim())) {
+        if (pushJoinVO.getLisOrder() != null && !"".equals(pushJoinVO.getLisOrder().trim())) {
+            LisPacsInfoForDJVO lisPacsInfoForDJVO = new LisPacsInfoForDJVO();
+            List<LisConfigDTO> lisConfigDTO;
+            List<PacsConfigDTO> pacsConfigDTO;
             lisPacsInfoForDJVO.setHosCode(pushJoinVO.getHosCode());
-                lisPacsInfoForDJVO.setOrderCode(pushJoinVO.getLisOrderCode());
-                lisConfigDTO1 = tranLisConfigFacade.getLisConfigByCodeAndHosCode(lisPacsInfoForDJVO);
-                if (lisConfigDTO1.size() > 0) {
-                    if (lisConfigDTO1.get(0).getUniqueName().indexOf("、") != -1) {
-                        orderCode = lisConfigDTO1.get(0).getUniqueName().split("、");
+            lisPacsInfoForDJVO.setMealName(pushJoinVO.getLisOrder().trim());
+            lisConfigDTO = tranLisConfigFacade.getLisConfigByNameAndHosCode(lisPacsInfoForDJVO);
+            if (lisConfigDTO.size() == 1) {
+                if (lisConfigDTO.get(0).getUniqueName().indexOf("、") != -1) {
+                    orderCode = lisConfigDTO.get(0).getUniqueName().split("、");
+                    sb3.append("[");
+                    for (int i = 0; i < orderCode.length; i++) {
+                        if (i == orderCode.length - 1) {
+                            sb3.append("{\"name\":\"" + orderCode[i] + "\",\"type\":12,\"position\":1}");
+                        } else {
+                            sb3.append("{\"name\":\"" + orderCode[i] + "\",\"type\":12,\"position\":1},");
+                        }
+                    }
+                    sb3.append("]");
+                } else {
+                    sb3.append("[{\"name\":\"" + lisConfigDTO.get(0).getUniqueName() + "\",\"type\":12,\"position\":1}]");
+                    pushJoinVO.setLisOrder(lisConfigDTO.get(0).getUniqueName());
+                }
+            } else if (lisConfigDTO.size() > 1) {
+                for (int i = 0; i < lisConfigDTO.size(); i++) {
+                    if (lisConfigDTO.get(i).getUniqueName().indexOf("--") == -1) {
+                        pushJoinVO.setLisOrder(lisConfigDTO.get(i).getUniqueName());
+                    }
+                }
+                if (lisConfigDTO.get(0).getUniqueName().indexOf("--") != -1) {
+                    sb3.append("[{\"name\":\"" + lisConfigDTO.get(0).getUniqueName().substring(0, lisConfigDTO.get(0).getUniqueName().indexOf("--")) + "\",\"type\":12,\"position\":1}]");
+                } else {
+                    sb3.append("[{\"name\":\"" + lisConfigDTO.get(0).getUniqueName() + "\",\"type\":12,\"position\":1}]");
+                }
+            } else {
+                pacsConfigDTO = pacsConfigFacade.getPacsConfigByNamesAndHosCode(lisPacsInfoForDJVO);
+                if (pacsConfigDTO.size() == 1) {
+                    if (pacsConfigDTO.get(0).getUniqueName().indexOf("、") != -1) {
+                        orderCode = pacsConfigDTO.get(0).getUniqueName().split("、");
                         sb3.append("[");
                         for (int i = 0; i < orderCode.length; i++) {
                             if (i == orderCode.length - 1) {
-                                sb3.append("{\"name\":\"" + orderCode[i] + "\",\"type\":12,\"position\":1}");
+                                sb3.append("{\"name\":\"" + orderCode[i] + "\",\"type\":6,\"position\":1}");
                             } else {
-                                sb3.append("{\"name\":\"" + orderCode[i] + "\",\"type\":12,\"position\":1},");
+                                sb3.append("{\"name\":\"" + orderCode[i] + "\",\"type\":6,\"position\":1},");
                             }
                         }
                         sb3.append("]");
-                    }else{
-                        sb3.append("[{\"name\":\"" + lisConfigDTO1.get(0).getUniqueName() + "\",\"type\":12,\"position\":1}]");
+                    } else {
+                        pushJoinVO.setLisOrder(pacsConfigDTO.get(0).getUniqueName());
+                        sb3.append("[{\"name\":\"" + pacsConfigDTO.get(0).getUniqueName() + "\",\"type\":6,\"position\":1}]");
                     }
-
-                } else {
-                    pacsConfigDTO = pacsConfigFacade.getPacsConfigByCodeAndHosCode(lisPacsInfoForDJVO);
-                    if(pacsConfigDTO.size()>0){
+                } else if (pacsConfigDTO.size() > 1) {
+                    for (int i = 0; i < pacsConfigDTO.size(); i++) {
+                        if (pacsConfigDTO.get(i).getUniqueName().indexOf("--") == -1) {
+                            pushJoinVO.setLisOrder(pacsConfigDTO.get(i).getUniqueName());
+                        }
+                    }
+                    if (pacsConfigDTO.get(0).getUniqueName().indexOf("--") != -1) {
+                        sb3.append("[{\"name\":\"" + pacsConfigDTO.get(0).getUniqueName().substring(0, pacsConfigDTO.get(0).getUniqueName().indexOf("--")) + "\",\"type\":6,\"position\":1}]");
+                    } else {
                         sb3.append("[{\"name\":\"" + pacsConfigDTO.get(0).getUniqueName() + "\",\"type\":6,\"position\":1}]");
                     }
                 }
             }
-            /*if (lisConfigDTO != null && lisConfigDTO.size() != 0) {
-                pushJoinVO.setLisOrder(lisConfigDTO.get(0).getUniqueName().substring(0, lisConfigDTO.get(0).getUniqueName().indexOf("--")));
-            } else {
-                pushJoinVO.setLisOrder("");
-            }*/
+        }
 
         //辅检套餐名转公表
-        if (pushJoinVO.getPacsOrderCode() != null && !"".equals(pushJoinVO.getPacsOrderCode().trim())) {
-            lisPacsInfoForDJVO.setOrderCode(pushJoinVO.getPacsOrderCode());
+        if (pushJoinVO.getPacsOrder() != null && !"".equals(pushJoinVO.getPacsOrder().trim())) {
+            LisPacsInfoForDJVO lisPacsInfoForDJVO = new LisPacsInfoForDJVO();
+            List<LisConfigDTO> lisConfigDTO;
+            List<PacsConfigDTO> pacsConfigDTO;
+            lisPacsInfoForDJVO.setMealName(pushJoinVO.getPacsOrder().trim());
             lisPacsInfoForDJVO.setHosCode(pushJoinVO.getHosCode());
-            pacsConfigDTO = pacsConfigFacade.getPacsConfigByCodeAndHosCode(lisPacsInfoForDJVO);
-            if (pacsConfigDTO != null && pacsConfigDTO.size() != 0) {
-                sb4.append("[{\"name\":\"" + pacsConfigDTO.get(0).getUniqueName() + "\",\"type\":6,\"position\":1}]");
+            pacsConfigDTO = pacsConfigFacade.getPacsConfigByNamesAndHosCode(lisPacsInfoForDJVO);
+            if (pacsConfigDTO.size() == 1) {
+                if (pacsConfigDTO.get(0).getUniqueName().indexOf("、") != -1) {
+                    orderCode = pacsConfigDTO.get(0).getUniqueName().split("、");
+                    sb4.append("[");
+                    for (int i = 0; i < orderCode.length; i++) {
+                        if (i == orderCode.length - 1) {
+                            sb4.append("{\"name\":\"" + orderCode[i] + "\",\"type\":6,\"position\":1}");
+                        } else {
+                            sb4.append("{\"name\":\"" + orderCode[i] + "\",\"type\":6,\"position\":1},");
+                        }
+                    }
+                    sb4.append("]");
+                } else {
+                    sb4.append("[{\"name\":\"" + pacsConfigDTO.get(0).getUniqueName() + "\",\"type\":6,\"position\":1}]");
+                }
+                pushJoinVO.setPacsOrder(pacsConfigDTO.get(0).getUniqueName());
+            } else if (pacsConfigDTO.size() > 1) {
+                for (int i = 0; i < pacsConfigDTO.size(); i++) {
+                    if (pacsConfigDTO.get(i).getUniqueName().indexOf("--") == -1) {
+                        pushJoinVO.setPacsOrder(pacsConfigDTO.get(i).getUniqueName());
+                    }
+                }
+                if (pacsConfigDTO.get(0).getUniqueName().indexOf("--") != -1) {
+                    sb4.append("[{\"name\":\"" + pacsConfigDTO.get(0).getUniqueName().substring(0, pacsConfigDTO.get(0).getUniqueName().indexOf("--")) + "\",\"type\":6,\"position\":1}]");
+                } else {
+                    sb4.append("[{\"name\":\"" + pacsConfigDTO.get(0).getUniqueName() + "\",\"type\":6,\"position\":1}]");
+                }
             } else {
-                lisConfigDTO = tranLisConfigFacade.getLisConfigByCodeAndHosCode(lisPacsInfoForDJVO);
-                if (lisConfigDTO.size() > 0) {
-                    sb4.append("[{\"name\":\"" + lisConfigDTO.get(0).getUniqueName() + "\",\"type\":12,\"position\":1}]");
+                lisConfigDTO = tranLisConfigFacade.getLisConfigByNameAndHosCode(lisPacsInfoForDJVO);
+                if (lisConfigDTO.size() == 1) {
+                    if (lisConfigDTO.get(0).getUniqueName().indexOf("、") != -1) {
+                        orderCode = lisConfigDTO.get(0).getUniqueName().split("、");
+                        sb4.append("[");
+                        for (int i = 0; i < orderCode.length; i++) {
+                            if (i == orderCode.length - 1) {
+                                sb4.append("{\"name\":\"" + orderCode[i] + "\",\"type\":12,\"position\":1}");
+                            } else {
+                                sb4.append("{\"name\":\"" + orderCode[i] + "\",\"type\":12,\"position\":1},");
+                            }
+                        }
+                        sb4.append("]");
+                    } else {
+                        sb4.append("[{\"name\":\"" + lisConfigDTO.get(0).getUniqueName() + "\",\"type\":12,\"position\":1}]");
+                    }
+                    pushJoinVO.setPacsOrder(lisConfigDTO.get(0).getUniqueName());
+                } else if (lisConfigDTO.size() > 1) {
+                    for (int i = 0; i < lisConfigDTO.size(); i++) {
+                        if (lisConfigDTO.get(i).getUniqueName().indexOf("--") == -1) {
+                            pushJoinVO.setPacsOrder(lisConfigDTO.get(i).getUniqueName());
+                        }
+                    }
+                    if (lisConfigDTO.get(0).getUniqueName().indexOf("--") != -1) {
+                        sb4.append("[{\"name\":\"" + lisConfigDTO.get(0).getUniqueName().substring(0, lisConfigDTO.get(0).getUniqueName().indexOf("--")) + "\",\"type\":12,\"position\":1}]");
+                    } else {
+                        sb4.append("[{\"name\":\"" + lisConfigDTO.get(0).getUniqueName() + "\",\"type\":12,\"position\":1}]");
+                    }
                 }
             }
         }
@@ -473,7 +560,7 @@ public class InquiryInfoController {
 
             //门诊 化验辅检静态知识
             case "9":
-                if (pushJoinVO.getLisOrderCode() != null && !"".equals(pushJoinVO.getLisOrderCode().trim())) {
+                if (pushJoinVO.getLisOrder() != null && !"".equals(pushJoinVO.getLisOrder().trim())) {
                     if (!sb3.toString().equals("")) {
                         mrId = mrFacade.createMr(pushJoinVO);
                         url = "http://192.1.3.116:5446/indexHorizontal.html?" +
@@ -494,7 +581,7 @@ public class InquiryInfoController {
                         return RespDTO.onSuc("暂未维护该项目静态知识！");
                     }
 
-                } else if (pushJoinVO.getPacsOrderCode() != null && !"".equals(pushJoinVO.getPacsOrderCode().trim())) {
+                } else if (pushJoinVO.getPacsOrder() != null && !"".equals(pushJoinVO.getPacsOrder().trim())) {
                     if (!sb4.toString().equals("")) {
                         mrId = mrFacade.createMr(pushJoinVO);
                         url = "http://192.1.3.116:5446/indexHorizontal.html?" +
@@ -619,7 +706,7 @@ public class InquiryInfoController {
 
                         url = "http://192.1.3.116:5446/index.html?" +
                                 "mrId=" + mrId + //redis保存产生唯一值
-                                "&tipsName=" + pushJoinVO.getLisOrder() +  //静态信息名称（化验项名称、辅捡项名称）
+                                "&tipsName=" + URLEncoder.encode(sb3.toString(), "UTF-8") +  //静态信息名称（化验项名称、辅捡项名称）
                                 "&tipsType=12" +
                                 "&showTab=1" +
                                 "&hospitalCode=" + pushJoinVO.getHosCode() + //医院编码
@@ -641,7 +728,7 @@ public class InquiryInfoController {
 
                         url = "http://192.1.3.116:5446/index.html?" +
                                 "mrId=" + mrId + //redis保存产生唯一值
-                                "&tipsName=" + pushJoinVO.getPacsOrder() +  //静态信息名称（化验项名称、辅捡项名称）
+                                "&tipsName=" + URLEncoder.encode(sb4.toString(), "UTF-8") +  //静态信息名称（化验项名称、辅捡项名称）
                                 "&tipsType=6" +
                                 "&showTab=1" +
                                 "&hospitalCode=" + pushJoinVO.getHosCode() + //医院编码