优化高风险手术6

src/main/java/com/diagbot/facade/IndicationFacade.java

@@ -1,6 +1,7 @@
 package com.diagbot.facade;
 
 import com.diagbot.client.StandConvertServiceClient;
+import com.diagbot.dto.BillMsg;
 import com.diagbot.dto.IndicationDTO;
 import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.exception.CommonErrorCode;

src/main/java/com/diagbot/facade/TestFacade.java

@@ -738,29 +738,35 @@ public class TestFacade {
             //年龄
             String[] split = bean.getAgeAll().split(",");
             indicationPushVO.setAge((int) getValueNum(split));
+            indicationPushVO.setMsg("年龄");
             indicationPushVO.setRuleType("3");
             indicationPushVO.setIdNum(bean.getIdNum());
-            List<Item> operationOrder = new ArrayList<>();
+
             //体格
             String physique = bean.getPhysique();
             String[] physiqueStrArray = physique.split("，");
             for (String str : physiqueStrArray) {
+                IndicationPushVO indphysiquePushVO = new IndicationPushVO();
                 if (str.contains(",")) {
                     //包含英文逗号
                     String[] strArray = str.split(",");
                     String t = strArray[0] + getValue(strArray) + strArray[3];
-                    indicationPushVO.setVital(t);
-                    break;
+                    indphysiquePushVO.setVital(t);
+                    indphysiquePushVO.setMsg("体格"+t);
+                    indicationPushVOList.add(indicationPushVO);
                 } else {
-                    indicationPushVO.setVital(str);
-                    break;
+                    indphysiquePushVO.setVital(str);
+                    indphysiquePushVO.setMsg("体格"+str);
+                    indicationPushVOList.add(indicationPushVO);
                 }
             }
             //化验
             String lisAll = bean.getLisAll();
             String[] physiquelisAll = lisAll.split("，");
-            List<Lis> lisList = new ArrayList<>();
+
             for (String str : physiquelisAll) {
+                IndicationPushVO indicationPushVOlisList = new IndicationPushVO();
+                List<Lis> lisList = new ArrayList<>();
                 if (str.contains(",")) {
                     //包含英文逗号
                     String[] strArray = str.split(",");
@@ -771,41 +777,50 @@ public class TestFacade {
                     lisBean.setDetailName(strArray[0]);
                     lisBean.setValue(getValue(strArray));
                     lisList.add(lisBean);
-                    break;
+                    indicationPushVOlisList.setMsg("化验"+strArray[0]);
+                    indicationPushVOlisList.setLis(lisList);
+                    indicationPushVOList.add(indicationPushVOlisList);
                 }
             }
-            indicationPushVO.setLis(lisList);
+
             //辅检
             String pacsAll = bean.getPacsAll();
             String[] physiquepacsAll = pacsAll.split("，");
             indicationPushVO.setSymptom(pacsAll);
-            List<Pacs> pacs = new ArrayList<>();
+
             for (String pacsStr : physiquepacsAll) {
+                IndicationPushVO indicationPushVOpacs = new IndicationPushVO();
+                List<Pacs> pacs = new ArrayList<>();
                 Pacs pacs1 = new Pacs();
                 pacs1.setUniqueName("腹部CT");
                 pacs1.setName("腹部CT");
                 pacs1.setResult(pacsStr);
                 pacs.add(pacs1);
-                break;
+                indicationPushVOpacs.setMsg("辅检"+pacsStr);
+                indicationPushVOpacs.setPacs(pacs);
+                indicationPushVOList.add(indicationPushVO);
             }
-            indicationPushVO.setPacs(pacs);
             //诊断"腹部CT"
             String disease = bean.getDisease();
             String[] physiquedisease = disease.split("，");
-            List<Item> diag = new ArrayList<>();
+
             for (String diseaseStr : physiquedisease) {
+                IndicationPushVO indicationPushVOpacs = new IndicationPushVO();
+                List<Item> diag = new ArrayList<>();
                 Item item = new Item();
                 item.setUniqueName(diseaseStr);
                 item.setName(diseaseStr);
                 diag.add(item);
-                break;
+                indicationPushVOpacs.setMsg("诊断"+diseaseStr);
+                indicationPushVOpacs.setDiag(diag);
+                indicationPushVOList.add(indicationPushVOpacs);
             }
-            indicationPushVO.setDiag(diag);
+            List<Item> operationOrder = new ArrayList<>();
             Item item = new Item();
             item.setUniqueName(bean.getOperationName());
             item.setName(bean.getOperationName());
             operationOrder.add(item);
-            indicationPushVO.setOperationOrder(operationOrder);
+            //indicationPushVO.setOperationOrder(operationOrder);
             indicationPushVOList.add(indicationPushVO);
         }
 
@@ -816,7 +831,8 @@ public class TestFacade {
             try {
                 IndicationDTO indicationDTO = indicationFacade.indicationFac(indicationPushVO);
                 if (ListUtil.isEmpty(indicationDTO.getHighRiskList())) {
-                    msg.add("第【" + indicationPushVO.getIdNum() + "】行未匹配");
+                    msg.add("第【" + indicationPushVO.getIdNum() + "】行未匹配"+indicationPushVO.getMsg());
+
                 }
             } catch (Exception e) {
                 System.out.println(e.getMessage());

src/main/java/com/diagbot/vo/IndicationPushVO.java

@@ -24,4 +24,7 @@ public class IndicationPushVO extends SearchData {
     List<String> ruleTypeList = new ArrayList<>();
     // 文件的行号，测试文件数据用
     private String idNum;
+
+    private String msg;
+
 }