Merge remote-tracking branch 'origin/dev/ruleClass20210805' into debug

cdssman-service/src/main/java/com/diagbot/client/CdssCoreClient.java

@@ -213,4 +213,12 @@ public interface CdssCoreClient {
     @PostMapping("/klDisease/searchConcept")
     RespDTO<List<GetAllForRelationDTO>> searchConcept(@Valid @RequestBody SearchConceptVO searchConceptVO);
 
+    //术语集合新增
+    @PostMapping("/klDisease/addConceptClass")
+    RespDTO<List<GetAllForRelationDTO>> addConceptClass(@Valid @RequestBody SearchConceptVO searchConceptVO);
+
+    //规则维护术语查询
+    @PostMapping("/klDisease/searchConceptRuleClass")
+    RespDTO<List<GetAllForRelationDTO>> searchConceptRuleClass(@Valid @RequestBody SearchConceptVO searchConceptVO);
+
 }

cdssman-service/src/main/java/com/diagbot/client/hystrix/CdssCoreHystrix.java

@@ -290,4 +290,16 @@ public class CdssCoreHystrix implements CdssCoreClient {
         log.error("【hystrix】调用{}异常", "searchConcept");
         return null;
     }
+
+    @Override
+    public RespDTO<List<GetAllForRelationDTO>> addConceptClass(@Valid SearchConceptVO searchConceptVO) {
+        log.error("【hystrix】调用{}异常", "addConceptClass");
+        return null;
+    }
+
+    @Override
+    public RespDTO<List<GetAllForRelationDTO>> searchConceptRuleClass(@Valid SearchConceptVO searchConceptVO) {
+        log.error("【hystrix】调用{}异常", "searchConceptRuleClass");
+        return null;
+    }
 }

cdssman-service/src/main/java/com/diagbot/facade/KlConceptCollectionFacade.java

@@ -124,7 +124,7 @@ public class KlConceptCollectionFacade {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "术语集合不允许为空，保存失败");
         }
         if (ListUtil.isEmpty(conceptCollectionSaveVO.getConcepts())) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "基础术语列表不允许为空，保存失败");
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "保存失败，关联术语不能为空");
         }
 
         KlConcept collection = klConceptFacade.getById(conceptCollectionSaveVO.getCollectionId());

cdssman-service/src/main/java/com/diagbot/facade/KlConceptFacade.java

@@ -432,6 +432,7 @@ public class KlConceptFacade extends KlConceptServiceImpl {
                     .eq(getAllForRelationVO.getTypeId() != null, "lib_type", getAllForRelationVO.getTypeId())
                     .eq("status", StatusEnum.Enable.getKey())
                     .notIn(ListUtil.isNotEmpty(getAllForRelationVO.getExcludedConceptIds()), "id", getAllForRelationVO.getExcludedConceptIds())
+                    .last("limit 100")
             );
             //            retList = BeanUtil.listCopyTo(conceptList, GetAllForRelationDTO.class);
             if (ListUtil.isNotEmpty(conceptList)) {
@@ -517,6 +518,18 @@ public class KlConceptFacade extends KlConceptServiceImpl {
         return getAllForRelationDTOS;*/
     }
 
+    public List<GetAllForRelationDTO> addConceptClass(SearchConceptVO searchConceptVO) {
+        RespDTO<List<GetAllForRelationDTO>> relationDTORespDTO = cdssCoreClient.addConceptClass(searchConceptVO);
+        RespDTOUtil.respNGDeal(relationDTORespDTO, "术语集合新增失败");
+        return relationDTORespDTO.data;
+    }
+
+    public List<GetAllForRelationDTO> searchConceptRuleClass(SearchConceptVO searchConceptVO) {
+        RespDTO<List<GetAllForRelationDTO>> relationDTORespDTO = cdssCoreClient.searchConceptRuleClass(searchConceptVO);
+        RespDTOUtil.respNGDeal(relationDTORespDTO, "查询规则维护术语查询术语失败");
+        return relationDTORespDTO.data;
+    }
+
     /**
      * 筛选符合类型的概念id
      *

cdssman-service/src/main/java/com/diagbot/vo/SearchConceptVO.java

@@ -34,6 +34,6 @@ public class SearchConceptVO {
     /**
      * 标志（新增 -1 修改 2）
      */
-    @ApiModelProperty(value="新增修改标志")
-    private Integer sign;
+//    @ApiModelProperty(value="新增修改标志")
+//    private Integer sign;
 }

cdssman-service/src/main/java/com/diagbot/web/KlDiseaseController.java

@@ -110,4 +110,26 @@ public class KlDiseaseController {
         return RespDTO.onSuc(klConcepts);
     }
 
+    @ApiOperation(value = "术语集合新增[by:kongwz]",
+            notes = "name: 查询术语的名称<br>" +
+                    "libType: 查询术语的词性<br>" +
+                    "excludedConceptIds: 需要排除的概念id集合")
+    @PostMapping("/addConceptClass")
+    @SysLogger("addConceptClass")
+    public RespDTO<List<GetAllForRelationDTO>> addConceptClass(@Valid @RequestBody SearchConceptVO searchConceptVO) {
+        List<GetAllForRelationDTO> getAllForRelationDTOS = klConceptFacade.addConceptClass(searchConceptVO);
+        return RespDTO.onSuc(getAllForRelationDTOS);
+    }
+
+    @ApiOperation(value = "规则维护术语查询[by:kongwz]",
+            notes = "name: 查询术语的名称<br>" +
+                    "libType: 查询术语的词性<br>" +
+                    "excludedConceptIds: 需要排除的概念id集合")
+    @PostMapping("/searchConceptRuleClass")
+    @SysLogger("searchConceptRuleClass")
+    public RespDTO<List<GetAllForRelationDTO>> searchConceptRuleClass(@Valid @RequestBody SearchConceptVO searchConceptVO) {
+        List<GetAllForRelationDTO> getAllForRelationDTOS = klConceptFacade.searchConceptRuleClass(searchConceptVO);
+        return RespDTO.onSuc(getAllForRelationDTOS);
+    }
+
 }