Merge remote-tracking branch 'origin/dev/KLBstand' into dev/KLBstand

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

@@ -53,44 +53,43 @@ public class ConceptFacade extends ConceptServiceImpl {
     }
 
     /**
-     * 根据名称和词性获取概念Map
+     * 根据概念Id列表获取概念列表Map
      *
      * @param conceptSearchVO 搜索参数
-     * @return 术语和术语id Map
+     * @return 术语id和术语 Map
      */
-    public Map<String, Long> getConceptMap(ConceptSearchVO conceptSearchVO) {
+    public Map<Long, String> getConceptMap(ConceptSearchVO conceptSearchVO) {
         //入参验证
-        if (ListUtil.isEmpty(conceptSearchVO.getNameList())) {
+        if (ListUtil.isEmpty(conceptSearchVO.getConceptIds())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "术语列表不能为空");
         }
 
-        if (IntegerUtil.isNull(conceptSearchVO.getType())) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "类型不能为空");
-        }
-
-        List<Integer> inputTyps = new ArrayList<>();
-        inputTyps.add(ConceptTypeEnum.Symptom.getKey());
-        inputTyps.add(ConceptTypeEnum.Vital.getKey());
-        inputTyps.add(ConceptTypeEnum.Lis.getKey());
-        inputTyps.add(ConceptTypeEnum.Pacs.getKey());
-        inputTyps.add(ConceptTypeEnum.Disease.getKey());
-
-        if (!inputTyps.contains(conceptSearchVO.getType())) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "类型超出范围");
-        }
         //获取结构
         List<Concept> concepts
-                = this.getListByNamesAndType(conceptSearchVO.getNameList(),
-                ParamConvertUtil.conceptConvert2Lib(conceptSearchVO.getType()));
+                = this.getListByIds(conceptSearchVO.getConceptIds());
 
         //出参封装
-        Map<String, Long> map = new HashMap<>();
+        Map<Long, String> map = new HashMap<>();
         if (ListUtil.isNotEmpty(concepts)) {
-            map = concepts.stream().collect(Collectors.toMap(r -> r.getLibName(), r -> r.getId()));
+            map = concepts.stream().collect(Collectors.toMap(r -> r.getId(), r -> r.getLibName()));
         }
         return map;
     }
 
+    /**
+     * 根据概念Id列表获取概念列表
+     *
+     * @param ids
+     * @return
+     */
+    public List<Concept> getListByIds(List<Long> ids) {
+        QueryWrapper<Concept> conceptQueryWrapper = new QueryWrapper<>();
+        conceptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .in("id", ids);
+        List<Concept> list = this.list(conceptQueryWrapper);
+        return list;
+    }
+
     /**
      * 根据名称和词性获取概念列表
      *

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

@@ -3,8 +3,6 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -15,8 +13,6 @@ import java.util.List;
 @Getter
 @Setter
 public class ConceptSearchVO {
-    //术语列表
-    private List<String> nameList;
-    //类型
-    private Integer type;
+    //术语Id列表
+    private List<Long> conceptIds;
 }

aipt-service/src/main/java/com/diagbot/web/ConceptController.java

@@ -48,14 +48,13 @@ public class ConceptController {
     }
 
     /**
-     * 根据名称和词性获取概念Map
+     * 根据概念Id列表获取概念列表Map
      *
      * @param conceptSearchVO 搜索参数
-     * @return 术语和术语id Map
+     * @return 术语id和术语 Map
      */
-    @ApiOperation(value = "知识库标准化-根据名称和词性获取概念列表[by:gaodm]",
-            notes = "nameList: 术语列表<br>" +
-                    "type：类型(1：症状 4：查体，5：化验 6：辅检 7：诊断)，必填<br>")
+    @ApiOperation(value = "知识库标准化-根据概念Id列表获取概念列表Map[by:gaodm]",
+            notes = "conceptIds: 术语Id列表")
     @PostMapping("/getConceptMap")
     @SysLogger("getConceptMap")
     public RespDTO<Map<String, Long>> getConceptMap(@RequestBody ConceptSearchVO conceptSearchVO){

icss-service/src/main/java/com/diagbot/client/AiptServiceClient.java

@@ -114,13 +114,13 @@ public interface AiptServiceClient {
     public RespDTO<List<IndexConfigDTO>> getindexConfigs(@RequestBody IndexConfigdiseaseNameVO indexConfigdiseaseNameVO);
 
     /**
-     * 根据名称和词性获取概念Map
+     * 根据概念Id列表获取概念列表Map
      *
      * @param conceptSearchVO 搜索参数
-     * @return 术语和术语id Map
+     * @return 术语id和术语 Map
      */
     @PostMapping("/concept/getConceptMap")
-    RespDTO<Map<String, Long>> getConceptMap(@RequestBody ConceptSearchVO conceptSearchVO);
+    RespDTO<Map<Long, String>> getConceptMap(@RequestBody ConceptSearchVO conceptSearchVO);
 
     /**
      * 获取治疗方案

icss-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java

@@ -143,13 +143,13 @@ public class AiptServiceHystrix implements AiptServiceClient {
     }
 
     /**
-     * 根据名称和词性获取概念Map
+     * 根据概念Id列表获取概念列表Map
      *
      * @param conceptSearchVO 搜索参数
-     * @return 术语和术语id Map
+     * @return 术语id和术语 Map
      */
     @Override
-    public RespDTO<Map<String, Long>> getConceptMap(@RequestBody ConceptSearchVO conceptSearchVO) {
+    public RespDTO<Map<Long, String>> getConceptMap(@RequestBody ConceptSearchVO conceptSearchVO) {
         log.error("【hystrix】调用{}异常", "getConceptMap");
         return null;
     }

icss-service/src/main/java/com/diagbot/vo/ConceptSearchVO.java

@@ -13,8 +13,6 @@ import java.util.List;
 @Getter
 @Setter
 public class ConceptSearchVO {
-    //术语列表
-    private List<String> nameList;
-    //类型
-    private Integer type;
+    //术语Id列表
+    private List<Long> conceptIds;
 }