1、辅检静态知识检索

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

@@ -83,7 +83,7 @@ public class ConceptFacade {
                 }
                 break;
             case 3:
-                List<BaseNodeInfo> pacsNameList = pacsNameRepository.findByNameInIgnoreLabel(conceptVO.getNames());
+                List<BaseNodeInfo> pacsNameList = pacsNameRepository.findByNameInMultipleLabel(conceptVO.getNames());
                 if (ListUtil.isNotEmpty(pacsNameList)) {
                     retList = pacsNameList.stream()
                             .map(i -> i.getName())

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

@@ -248,7 +248,7 @@ public class RetrievalFacade {
                 size -= lisList.size();
             }
             if (size > 0) {
-                pacsList = pacsRepository.staticKnowledgeIndexIgnoreLabel(staticKnowledgeIndexVO.getHasInfo(), inputStr, inputStr, size);
+                pacsList = pacsRepository.staticKnowledgeIndexMultipleLabel(staticKnowledgeIndexVO.getHasInfo(), inputStr, inputStr, size);
                 size -= pacsList.size();
             }
             if (size > 0) {
@@ -267,7 +267,7 @@ public class RetrievalFacade {
                 lisList = lisRepository.staticKnowledgeIndex(staticKnowledgeIndexVO.getHasInfo(), inputStr, inputStr, size);
             }
             if (types.contains(5)) {
-                pacsList = pacsRepository.staticKnowledgeIndexIgnoreLabel(staticKnowledgeIndexVO.getHasInfo(), inputStr, inputStr, size);
+                pacsList = pacsRepository.staticKnowledgeIndexMultipleLabel(staticKnowledgeIndexVO.getHasInfo(), inputStr, inputStr, size);
             }
             if (types.contains(6)) {
                 operationList = operationRepository.staticKnowledgeIndex(staticKnowledgeIndexVO.getHasInfo(), inputStr, inputStr, size);
@@ -308,13 +308,14 @@ public class RetrievalFacade {
         //TODO 检验明细关联出检验套餐
         List<StaticKnowledgeIndexDTO> lisSetRelatecLisRetList = Lists.newLinkedList();
         //TODO 检验明细
+        List<StaticKnowledgeIndexDTO> lisRetList = Lists.newLinkedList();
         if (ListUtil.isNotEmpty(lisList)) {
             for (LisName lis : lisList) {
                 StaticKnowledgeIndexDTO staticDTO = new StaticKnowledgeIndexDTO();
                 staticDTO.setName(lis.getName());
                 staticDTO.setType(StaticTypeEnum.LIS.getKey());
                 staticDTO.setTypeName(StaticTypeEnum.LIS.getName());
-                retList.add(staticDTO);
+                lisRetList.add(staticDTO);
                 if (lis.getLissets().size() > 0) {
                     for (LisSet lisSet : lis.getLissets()) {
                         StaticKnowledgeIndexDTO staticLisSetDTO = new StaticKnowledgeIndexDTO();
@@ -343,6 +344,10 @@ public class RetrievalFacade {
         if (ListUtil.isNotEmpty(lisSetRetList)) {
             retList.addAll(lisSetRetList);
         }
+        //检验细项加在套餐之后
+        if (ListUtil.isNotEmpty(lisRetList)) {
+            retList.addAll(lisRetList);
+        }
 
         //TODO 检查
         if (ListUtil.isNotEmpty(pacsList)) {

src/main/java/com/diagbot/repository/PacsNameNode.java

@@ -223,7 +223,7 @@ public class PacsNameNode {
     public List<String> getPACSNameAndPACSSubNameList(String name, PacsNameRepository pacsRepository) {
 
         List<String> pacslist = new ArrayList<>();
-        List<BaseNodeInfo> pacslt = pacsRepository.indexIgnoreLabel(name, name, 100);
+        List<BaseNodeInfo> pacslt = pacsRepository.indexMultipleLabel(name, name, 100);
 
         if (ListUtil.isNotEmpty(pacslt) && pacslt.size() > 100) {
             pacslt = pacslt.subList(0, 100);