提示信息去重

src/main/java/com/diagbot/aggregate/IndicationTestAggregate.java

@@ -52,13 +52,19 @@ public class IndicationTestAggregate {
     public Map<String, Object> t1(@InvokeParameter("mapPath") Map<String, String> mapPath) {
         Map<String, Object> map = new LinkedHashMap<>();
         MultipartFile file = null;
-        // file = testFacade.getMulFileByPath(mapPath.get("【开单合理性】"));
-        // Map<String, Object> billMap = testFacade.importExcel(file, new TestLineVO());
-        // map.putAll(billMap);
 
         file = testFacade.getMulFileByPath(mapPath.get("【开单合理性_输血】"));
         Map<String, Object> billTransfusionMap = testFacade.testIndicationTransfusion(file, new TestLineVO());
         map.put("【开单合理性_输血】",billTransfusionMap);
+
+        file = testFacade.getMulFileByPath(mapPath.get("【危急值_化验】"));
+        Map<String, Object> criticalMapLis = testFacade.importCriticalLisExcel(file, new TestLineVO());
+        map.put("【危急值_化验】",criticalMapLis);
+
+        file = testFacade.getMulFileByPath(mapPath.get("【危急值_辅检】"));
+        Map<String, Object> criticalMapPacs = testFacade.importCriticalPacsExcel(file, new TestLineVO());
+        map.put("【危急值_辅检】",criticalMapPacs);
+
         return map;
     }
 
@@ -84,7 +90,14 @@ public class IndicationTestAggregate {
     @DataProvider("t4")
     public Map<String, Object> t4(@InvokeParameter("mapPath") Map<String, String> mapPath) {
         Map<String, Object> map = new LinkedHashMap<>();
-        MultipartFile file = testFacade.getMulFileByPath(mapPath.get("【其他值提醒_化验】"));
+        MultipartFile file = null;
+        file = testFacade.getMulFileByPath(mapPath.get("【开单合理性】"));
+        TestLineVO testLineVO = new TestLineVO();
+        testLineVO.setGetOne(true);
+        Map<String, Object> billMap = testFacade.importExcel(file, testLineVO);
+        map.putAll(billMap);
+
+        file = testFacade.getMulFileByPath(mapPath.get("【其他值提醒_化验】"));
         Map<String, Object> otherLisMap = testFacade.testOtherTipLis(file, new TestLineVO());
         map.put("【其他值提醒_化验】",otherLisMap);
 
@@ -96,14 +109,6 @@ public class IndicationTestAggregate {
         Map<String, Object> otherTransfusionMap = testFacade.testOtherTipTransfusion(file, new TestLineVO());
         map.put("【其他值提醒_输血】",otherTransfusionMap);
 
-        file = testFacade.getMulFileByPath(mapPath.get("【危急值_化验】"));
-        Map<String, Object> criticalMapLis = testFacade.importCriticalLisExcel(file, new TestLineVO());
-        map.put("【危急值_化验】",criticalMapLis);
-
-        file = testFacade.getMulFileByPath(mapPath.get("【危急值_辅检】"));
-        Map<String, Object> criticalMapPacs = testFacade.importCriticalPacsExcel(file, new TestLineVO());
-        map.put("【危急值_辅检】",criticalMapPacs);
-
         return map;
     }
 }

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

@@ -94,7 +94,7 @@ public class HighRiskFacade {
         highRiskProcess.process(highRiskNeoDTOList, res,wordCrfDTO);
 
         // 结果去重处理
-        // commonFacade.dealMsg(res.getHighRiskList());
+        commonFacade.dealMsg(res.getHighRiskList());
     }