zhoutg 4 gadi atpakaļ
vecāks
revīzija
6df7277ef4
1 mainītis faili ar 6 papildinājumiem un 18 dzēšanām
  1. 6 18
      src/main/java/com/diagbot/facade/CriticalFacade.java

+ 6 - 18
src/main/java/com/diagbot/facade/CriticalFacade.java

@@ -4,14 +4,11 @@ import com.diagbot.dto.CriticalNeoDTO;
 import com.diagbot.dto.IndicationDTO;
 import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.process.CriticalProcess;
-import com.diagbot.util.ListUtil;
 import com.diagbot.vo.CriticalNeoVO;
 import com.diagbot.vo.IndicationPushVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -26,6 +23,8 @@ public class CriticalFacade {
     NeoFacade neoFacade;
     @Autowired
     CriticalProcess criticalProcess;
+    @Autowired
+    CommonFacade commonFacade;
 
     /**
      * 危急值提示
@@ -37,21 +36,10 @@ public class CriticalFacade {
         CriticalNeoVO criticalNeoVOs = fillCriticalNeo(wordCrfDTO);
         List<CriticalNeoDTO> criticalNeoDTOList = neoFacade.getCritialNeo(criticalNeoVOs);
 
-        // 危急值去重,否则结果出现重复数据
-        if (ListUtil.isNotEmpty(criticalNeoDTOList)) {
-            List<String> standNameList = new ArrayList<>();
-            Iterator<CriticalNeoDTO> it = criticalNeoDTOList.iterator();
-            while (it.hasNext()) {
-                CriticalNeoDTO criticalNeoDTO = it.next();
-                if (standNameList.contains(criticalNeoDTO.getStandname())) {
-                    it.remove();
-                } else {
-                    standNameList.add(criticalNeoDTO.getStandname());
-                }
-            }
-            // 规则处理
-            criticalProcess.process(criticalNeoDTOList, wordCrfDTO, res);
-        }
+        criticalProcess.process(criticalNeoDTOList, wordCrfDTO, res);
+
+        // 结果去重处理
+        commonFacade.dealMsg(res.getCriticalValList());
     }