合并量表静态知识检索

aipt-service/src/main/java/com/diagbot/facade/ConceptFacade.java

@@ -11,6 +11,7 @@ import com.diagbot.enums.ConceptTypeEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.LexiconRSTypeEnum;
 import com.diagbot.enums.LexiconTypeEnum;
+import com.diagbot.enums.StaticSearchTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.ConceptServiceImpl;
@@ -365,6 +366,17 @@ public class ConceptFacade extends ConceptServiceImpl {
         RetrievalVO retrievalVO = new RetrievalVO();
         BeanUtil.copyProperties(getStaticKnowledgeVO, retrievalVO);
         List<Integer> types = retrievalVO.getTypes();
+        if (ListUtil.isEmpty(types)) {
+            // 添加词库搜索类型
+            types.add(StaticSearchTypeEnum.DIAGNOSIS.getKey());
+            types.add(StaticSearchTypeEnum.DRUGS.getKey());
+            types.add(StaticSearchTypeEnum.SYMPTOM.getKey());
+            types.add(StaticSearchTypeEnum.LIS_PACKAGE.getKey());
+            types.add(StaticSearchTypeEnum.PACS_ITEMS.getKey());
+            types.add(StaticSearchTypeEnum.OPERATION.getKey());
+            types.add(StaticSearchTypeEnum.GAUGE.getKey());
+            getStaticKnowledgeVO.setTypes(types);
+        }
         List<Integer> typesIn = new ArrayList<>();
         // 是否包含化验
         if (types.contains(LexiconTypeEnum.LIS_PACKAGE.getKey())) {
@@ -375,15 +387,6 @@ public class ConceptFacade extends ConceptServiceImpl {
             retrievalVO.setHasGauge(true); // 包含量表
             if (ListUtil.isNotEmpty(types) && types.size() == 1) {
                 retrievalVO.setOnlyGauge(true); // 只有量表
-                // 查询诊断名称
-                ConceptBaseVO conceptBaseVO = new ConceptBaseVO();
-                conceptBaseVO.setName(getStaticKnowledgeVO.getInputStr());
-                conceptBaseVO.setLibType(LexiconTypeEnum.DIAGNOSIS.getKey());
-                List<ConceptBaseDTO> conceptBaseDTOS = indexConceptFac(conceptBaseVO);
-                // 设置诊断名称
-                if (ListUtil.isNotEmpty(conceptBaseDTOS)) {
-                    getStaticKnowledgeVO.setDisNameList(conceptBaseDTOS.stream().map(row -> row.getName()).collect(Collectors.toList()));
-                }
             }
         }
         for (Integer type : types) {

aipt-service/src/main/java/com/diagbot/vo/GetStaticKnowledgeVO.java

@@ -21,7 +21,5 @@ public class GetStaticKnowledgeVO {
     //需要去重的id
     private List<Long> inputIds;
     //指定类型
-    private List<Integer> types;
-    // 量表关联的诊断名称
-    private List<String> disNameList = new ArrayList<>();
+    private List<Integer> types = new ArrayList<>();
 }

data-service/src/main/java/com/diagbot/facade/SearchFacade.java

@@ -4,9 +4,7 @@ import com.diagbot.client.AiptServiceClient;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.RetrievalDTO;
 import com.diagbot.dto.ScaleIndexDTO;
-import com.diagbot.enums.StaticSearchTypeEnum;
 import com.diagbot.util.BeanUtil;
-import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.GetStaticKnowledgeVO;
 import com.diagbot.vo.GetStaticVO;
@@ -14,7 +12,6 @@ import com.diagbot.vo.ScaleIndexVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -36,23 +33,7 @@ public class SearchFacade {
     public List<RetrievalDTO> getStaticKnowledge(GetStaticVO getStaticVO) {
         GetStaticKnowledgeVO getStaticKnowledgeVO = new GetStaticKnowledgeVO();
         BeanUtil.copyProperties(getStaticVO, getStaticKnowledgeVO);
-        List<Integer> types = getStaticKnowledgeVO.getTypes();
-        if (null == types) {
-            types = new ArrayList<>();
-        }
-        if (ListUtil.isEmpty(types)) {
-            // 添加词库搜索类型
-            types.add(StaticSearchTypeEnum.DIAGNOSIS.getKey());
-            types.add(StaticSearchTypeEnum.DRUGS.getKey());
-            types.add(StaticSearchTypeEnum.SYMPTOM.getKey());
-            types.add(StaticSearchTypeEnum.LIS_PACKAGE.getKey());
-            types.add(StaticSearchTypeEnum.PACS_ITEMS.getKey());
-            types.add(StaticSearchTypeEnum.OPERATION.getKey());
-            types.add(StaticSearchTypeEnum.GAUGE.getKey());
-            getStaticKnowledgeVO.setTypes(types);
-        }
-        RespDTO<List<RetrievalDTO>> res
-                = aiptServiceClient.getStaticKnowledge(getStaticKnowledgeVO);
+        RespDTO<List<RetrievalDTO>> res = aiptServiceClient.getStaticKnowledge(getStaticKnowledgeVO);
         RespDTOUtil.respNGDeal(res, "获取静态知识失败");
         return res.data;
     }

icss-service/src/main/java/com/diagbot/facade/RetrievalFacade.java

@@ -164,7 +164,7 @@ public class RetrievalFacade {
 
 
     /**
-     * 将词库搜索类型转换成标签类型；如果搜索词库类型为空，添加默认的搜索类型:诊断、药品、症状、化验、辅检、手术
+     * 将词库搜索类型转换成标签类型；如果搜索词库类型为空，表示搜索全部
      *
      * @param typeList 标签类型
      * @param getStaticKnowledgeVO 词库搜索对象
@@ -181,13 +181,6 @@ public class RetrievalFacade {
 
             // 添加词库搜索类型
             types.clear();
-            types.add(StaticSearchTypeEnum.DIAGNOSIS.getKey());
-            types.add(StaticSearchTypeEnum.DRUGS.getKey());
-            types.add(StaticSearchTypeEnum.SYMPTOM.getKey());
-            types.add(StaticSearchTypeEnum.LIS_PACKAGE.getKey());
-            types.add(StaticSearchTypeEnum.PACS_ITEMS.getKey());
-            types.add(StaticSearchTypeEnum.OPERATION.getKey());
-            types.add(StaticSearchTypeEnum.GAUGE.getKey());
             getStaticKnowledgeVO.setTypes(types);
             return ;
         }