zhoutg před 4 roky
rodič
revize
d8845c0c6b

+ 1 - 26
src/main/java/com/diagbot/facade/BillFacade.java

@@ -3,12 +3,10 @@ package com.diagbot.facade;
 import com.diagbot.biz.push.entity.Item;
 import com.diagbot.biz.push.entity.Lis;
 import com.diagbot.biz.push.entity.Pacs;
-import com.diagbot.dto.BillMsg;
 import com.diagbot.dto.BillNeoDTO;
 import com.diagbot.dto.IndicationDTO;
 import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.process.BillProcess;
-import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.BillNeoVO;
 import com.diagbot.vo.Drug;
@@ -17,8 +15,6 @@ import com.diagbot.vo.ItemExt;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -50,28 +46,7 @@ public class BillFacade {
         billProcess.process(billNeoDTOList, wordCrfDTO, res);
 
         // 结果去重处理
-        dealMsg(res);
-    }
-
-
-    /**
-     * 提示信息去重
-     * @param indicationDTO
-     */
-    public void dealMsg(IndicationDTO indicationDTO) {
-        List<BillMsg> billMsgList = indicationDTO.getBillMsgList();
-        if (ListUtil.isNotEmpty(billMsgList)) {
-            List<String> msgList = new ArrayList<>();
-            Iterator<BillMsg> it = billMsgList.iterator();
-            while (it.hasNext()) {
-                String msg = it.next().getMsg();
-                if (msgList.contains(msg)) {
-                    it.remove();
-                } else {
-                    msgList.add(msg);
-                }
-            }
-        }
+        commonFacade.dealMsg(res.getBillMsgList());
     }
 
     public BillNeoVO fillBillNeo(WordCrfDTO wordCrfDTO) {

+ 22 - 0
src/main/java/com/diagbot/facade/CommonFacade.java

@@ -3,6 +3,7 @@ package com.diagbot.facade;
 import com.diagbot.biz.push.entity.Item;
 import com.diagbot.biz.push.entity.Lis;
 import com.diagbot.client.CRFServiceClient;
+import com.diagbot.dto.BillMsg;
 import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.enums.StandConvertEnum;
 import com.diagbot.model.ai.AIAnalyze;
@@ -32,6 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -518,5 +520,25 @@ public class CommonFacade {
         lis.setUniqueName(uniqueName);
         return lis;
     }
+
+    /**
+     * 提示信息去重
+     *
+     * @param billMsgList
+     */
+    public void dealMsg(List<BillMsg> billMsgList) {
+        if (ListUtil.isNotEmpty(billMsgList)) {
+            List<String> msgList = new ArrayList<>();
+            Iterator<BillMsg> it = billMsgList.iterator();
+            while (it.hasNext()) {
+                String msg = it.next().getMsg();
+                if (msgList.contains(msg)) {
+                    it.remove();
+                } else {
+                    msgList.add(msg);
+                }
+            }
+        }
+    }
 }
 

+ 3 - 0
src/main/java/com/diagbot/facade/HighRiskFacade.java

@@ -92,6 +92,9 @@ public class HighRiskFacade {
         // highRiskNeoDTOList.add(highRiskNeoDTO);
         // TODO 测试数据结束
         highRiskProcess.process(highRiskNeoDTOList, res,wordCrfDTO);
+
+        // 结果去重处理
+        commonFacade.dealMsg(res.getHighRiskList());
     }