静态术语检索套餐去重

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

@@ -26,6 +26,7 @@ import com.diagbot.repository.YiBaoDiseaseNode;
 import com.diagbot.repository.YiBaoDiseaseRepository;
 import com.diagbot.repository.YiBaoOperationNameNode;
 import com.diagbot.repository.YiBaoOperationNameRepository;
+import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.RetrievalVO;
 import com.diagbot.vo.StaticKnowledgeIndexVO;
@@ -34,6 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description:
@@ -259,6 +261,18 @@ public class RetrievalFacade {
                 }
             }
         }
+        //合并检验套餐
+        Map<String, List<StaticKnowledgeIndexDTO>> lisSetMap
+                = EntityUtil.makeEntityListMap(lisSetRetList, "name");
+        Map<String, List<StaticKnowledgeIndexDTO>> lisSetRelatecLisMap
+                = EntityUtil.makeEntityListMap(lisSetRelatecLisRetList, "name");
+        for (Map.Entry<String, List<StaticKnowledgeIndexDTO>> entry : lisSetRelatecLisMap.entrySet()) {
+            if (lisSetMap == null
+                    || lisSetMap.size() == 0
+                    || !lisSetMap.containsKey(entry.getKey())) {
+                lisSetRetList.add(entry.getValue().get(0));
+            }
+        }
         //TODO 检验明细
         lisList = lisRepository.findByNameContaining(inputStr);
 
@@ -301,7 +315,7 @@ public class RetrievalFacade {
             retList.addAll(disRetList);
             retList.addAll(drugRetList);
             retList.addAll(lisSetRetList);
-            retList.addAll(lisSetRelatecLisRetList);
+            //retList.addAll(lisSetRelatecLisRetList);
             retList.addAll(lisRetList);
             retList.addAll(pacsRetList);
             retList.addAll(operationRetList);
@@ -313,10 +327,10 @@ public class RetrievalFacade {
                 retList.addAll(drugRetList);
             }
             if (types.contains(3)) {
-                //检索的套餐
+                //套餐
                 retList.addAll(lisSetRetList);
                 //明细关联出的套餐
-                retList.addAll(lisSetRelatecLisRetList);
+                //retList.addAll(lisSetRelatecLisRetList);
                 //明细
                 retList.addAll(lisRetList);
             }