新增根据名称和词性获取概念Map

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

@@ -73,6 +73,7 @@ public class ConceptFacade extends ConceptServiceImpl {
         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, "类型超出范围");

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

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

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

@@ -25,7 +25,6 @@ import com.diagbot.vo.EvaluationdiseaseNameVO;
 import com.diagbot.vo.GetDiseaseIcdVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.IndexConfigdiseaseNameVO;
-
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -94,20 +93,22 @@ public interface AiptServiceClient {
     RespDTO<GetTopPatientInfoDTO> getTopPatientInfo(@RequestBody GetTopPatientInfoVO getTopPatientInfoVO);
 
     /**
-	 * 获取管理评估模板
-	 * @param evaluationdiseaseNameVO
-	 * @return
-	 */
-	@PostMapping("/evaluation/getEvaluationModules")
-	public RespDTO<List<EvaluationDTO>> getEvaluationModules(@RequestBody EvaluationdiseaseNameVO evaluationdiseaseNameVO);
-
-	/**
-	 * 获取指标配置
-	 * @param indexConfigdiseaseNameVO
-	 * @return
-	 */
-	@PostMapping("/indexConfig/getindexConfigs")
-	public RespDTO<List<IndexConfigDTO>> getindexConfigs(@RequestBody IndexConfigdiseaseNameVO indexConfigdiseaseNameVO);
+     * 获取管理评估模板
+     *
+     * @param evaluationdiseaseNameVO
+     * @return
+     */
+    @PostMapping("/evaluation/getEvaluationModules")
+    RespDTO<List<EvaluationDTO>> getEvaluationModules(@RequestBody EvaluationdiseaseNameVO evaluationdiseaseNameVO);
+
+    /**
+     * 获取指标配置
+     *
+     * @param indexConfigdiseaseNameVO
+     * @return
+     */
+    @PostMapping("/indexConfig/getindexConfigs")
+    public RespDTO<List<IndexConfigDTO>> getindexConfigs(@RequestBody IndexConfigdiseaseNameVO indexConfigdiseaseNameVO);
 
     /**
      * 根据名称和词性获取概念Map

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

@@ -1,14 +1,5 @@
 package com.diagbot.client.hystrix;
 
-import java.util.List;
-import java.util.Map;
-
-import javax.validation.Valid;
-
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.client.bean.CalculateData;
 import com.diagbot.client.bean.GdbResponse;
@@ -34,8 +25,14 @@ import com.diagbot.vo.EvaluationdiseaseNameVO;
 import com.diagbot.vo.GetDiseaseIcdVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.IndexConfigdiseaseNameVO;
-
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description:调用中间层服务
@@ -128,17 +125,18 @@ public class AiptServiceHystrix implements AiptServiceClient {
         log.error("【hystrix】调用{}异常", "getTopPatientInfo");
         return null;
     }
+
     @Override
-	public RespDTO<List<EvaluationDTO>> getEvaluationModules(@Valid EvaluationdiseaseNameVO evaluationdiseaseNameVO) {
-		log.error("【hystrix】调用{}异常", "getEvaluationModules");
-		return null;
-	}
+    public RespDTO<List<EvaluationDTO>> getEvaluationModules(@Valid EvaluationdiseaseNameVO evaluationdiseaseNameVO) {
+        log.error("【hystrix】调用{}异常", "getEvaluationModules");
+        return null;
+    }
 
-	@Override
-	public RespDTO<List<IndexConfigDTO>> getindexConfigs(IndexConfigdiseaseNameVO indexConfigdiseaseNameVO) {
-		log.error("【hystrix】调用{}异常", "getindexConfigs");
-		return null;
-	}
+    @Override
+    public RespDTO<List<IndexConfigDTO>> getindexConfigs(IndexConfigdiseaseNameVO indexConfigdiseaseNameVO) {
+        log.error("【hystrix】调用{}异常", "getindexConfigs");
+        return null;
+    }
 
     /**
      * 根据名称和词性获取概念Map
@@ -147,7 +145,7 @@ public class AiptServiceHystrix implements AiptServiceClient {
      * @return 术语和术语id Map
      */
     @Override
-    public RespDTO<Map<String, Long>> getConceptMap(@RequestBody ConceptSearchVO conceptSearchVO){
+    public RespDTO<Map<String, Long>> getConceptMap(@RequestBody ConceptSearchVO conceptSearchVO) {
         log.error("【hystrix】调用{}异常", "getConceptMap");
         return null;
     }