添加接口入参注释

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

@@ -293,13 +293,13 @@ public class KlConceptFacade extends KlConceptServiceImpl {
     public List<GetAllForRelationDTO> searchConceptByNameAndLibType(SearchConceptVO searchConceptVO){
         List<GetAllForRelationDTO> getAllForRelationDTOS = Lists.newArrayList();
         String name = searchConceptVO.getName();
-        List<Integer> libTypes = searchConceptVO.getLibTypes();
+        Integer libType = searchConceptVO.getLibType();
         List<Long> excludedConceptIds = searchConceptVO.getExcludedConceptIds();
-        if(StringUtils.isNotBlank(name) || ListUtil.isNotEmpty(libTypes) ){
+        if(StringUtils.isNotBlank(name) && libType != null ){
             List<KlConcept> conceptList = this.list(new QueryWrapper<KlConcept>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
             .like(StringUtil.isNotBlank(name),"lib_name",name.trim())
-            .in(ListUtil.isNotEmpty(libTypes),"lib_type",libTypes)
+            .eq("lib_type",libType)
             .notIn(ListUtil.isNotEmpty(excludedConceptIds),"id",excludedConceptIds));
             if(ListUtil.isNotEmpty(conceptList)){
                 getAllForRelationDTOS = conceptList.stream().map(x ->{

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

@@ -142,12 +142,6 @@ public class KlDiseaseFacade extends KlDiseaseServiceImpl {
                 datas.add(diseaseSubDetailDTO);
             }
         });
-        /*if (MapUtils.isNotEmpty(disSubDetailMap)) {
-            disSubDetailMap.forEach((x, y) -> {
-                y.setLibType(Arrays.stream(RelationLibTypeEnum.getName(x).split("&")).map(z -> Integer.parseInt(z)).collect(Collectors.toList()));
-                datas.add(y);
-            });
-        }*/
         diseaseDetailDTO.setDatas(datas);
         diseaseTreeDetailDTO.setDiseaseDetailDTO(diseaseDetailDTO);
         diseaseTreeDetailDTO.setTypes(types);

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

@@ -53,77 +53,7 @@ public class RelationContactFacade extends KlRelationServiceImpl {
     @Autowired
     KlDiseaseFacade klDiseaseFacade;
 
-    public RelationNodeDTO relationContactDetail(RelationContactDetailVO relationContactDetailVO) {
-        RelationNodeDTO relationNodeDTO = new RelationNodeDTO();
 
-        KlConcept klConcept = klConceptFacade.getById(relationContactDetailVO.getConceptId());
-        relationNodeDTO.setConceptId(klConcept.getId());
-        relationNodeDTO.setConceptName(klConcept.getLibName());
-        relationNodeDTO.setIsDeletedConcept(klConcept.getIsDeleted());
-        relationNodeDTO.setConceptTypeId(new Long(klConcept.getLibType()));
-
-        relationNodeDTO.setNodeList(repairRelationDataForQuery(relationContactDetailVO.getConceptId(),
-                relationContactDetailVO.getRelationIds(), relationContactDetailVO.getTypeIds(),
-                null, klConcept.getIsDeleted()));
-
-        return relationNodeDTO;
-    }
-
-
-    /**
-     * 处理关系节点-查询事件
-     *
-     * @param conceptId
-     * @param relationIds
-     * @param typeIds
-     * @param hookConceptIds
-     * @param isDeletedParent
-     * @return
-     */
-    private List<RelationNodeDTO> repairRelationDataForQuery(Long conceptId, List<Long> relationIds,
-                                                             List<Long> typeIds, List<Long> hookConceptIds,
-                                                             String isDeletedParent) {
-        if (hookConceptIds == null) {
-            hookConceptIds = new ArrayList<>();
-            hookConceptIds.add(conceptId);
-        }
-
-        Long relationId = null, endTypeId = null;
-        if (ListUtil.isNotEmpty(relationIds)) {
-            relationId = relationIds.remove(0);
-        }
-        if (relationId == null) {
-            relationId = -999999l;
-        }
-        if (ListUtil.isNotEmpty(typeIds)) {
-            endTypeId = typeIds.remove(0);
-        }
-        List<RelationNodeDTO> relationNodeDTOList = this.baseMapper.getRelationNodeDTOs(conceptId, relationId, endTypeId);
-
-        for (RelationNodeDTO i : relationNodeDTOList) {
-            i.setConceptName(i.getConceptName());
-            i.setParentConceptName(i.getParentConceptName());
-            i.setConceptTypeName(LexiconEnum.getName(i.getConceptTypeId().intValue()));
-            i.setConceptNameType(i.getConceptName() + "(" + LexiconEnum.getName(i.getConceptTypeId().intValue()) + ")");
-            i.setParentConceptTypeName(LexiconEnum.getName(i.getParentConceptTypeId().intValue()));
-            i.setParentConceptNameType(i.getParentConceptName() + "("
-                    + LexiconEnum.getName(i.getParentConceptTypeId().intValue()) + ")");
-            i.setIsDeletedConcept(
-                    isDeletedParent.equals(IsDeleteEnum.Y.getKey()) ? IsDeleteEnum.Y.getKey() : i.getIsDeletedConcept()
-            );
-
-            if (!hookConceptIds.contains(i.getConceptId())) {
-                List<Long> hookConceptIds_ = new ArrayList<>();
-                hookConceptIds_.addAll(hookConceptIds);
-                hookConceptIds_.add(i.getConceptId());
-                i.setNodeList(repairRelationDataForQuery(i.getConceptId(),
-                        Lists.newArrayList(relationIds), Lists.newArrayList(typeIds),
-                        hookConceptIds_, i.getIsDeletedConcept()));
-            }
-        }
-
-        return relationNodeDTOList;
-    }
 
     @DS("med")
     @DSTransactional

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

@@ -5,6 +5,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -22,7 +23,8 @@ public class SearchConceptVO {
      * 词性id
      */
     @ApiModelProperty(value="词性id")
-    private List<Integer> libTypes;
+    @NotNull(message ="请输入搜索词的词性" )
+    private Integer libType;
     /**
      * 需要排除的概念id集合
      */

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

@@ -32,7 +32,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/klDisease")
 @SuppressWarnings("unchecked")
-@Api(value = "疾病相关API", tags = { "疾病相关API" })
+@Api(value = "疾病相关API", tags = {"疾病相关API"})
 public class KlDiseaseController {
     @Autowired
     KlDiseaseFacade klDiseaseFacade;
@@ -42,9 +42,9 @@ public class KlDiseaseController {
     RelationContactFacade relationContactFacade;
 
     @ApiOperation(value = "分页获取诊断依据列表[by:kongwz]",
-    notes = "disName: 要查询的疾病（可模糊查询）<br>"+
-            "current: 当前页 <br>"+
-            "size: 每页条数")
+            notes = "disName: 要查询的疾病（可模糊查询）<br>" +
+                    "current: 当前页 <br>" +
+                    "size: 每页条数")
     @PostMapping("/getDiseasePage")
     @SysLogger("getDiseasePage")
     public RespDTO<IPage<DiseasePageDTO>> getDiseasePages(@RequestBody DiseasePageVO diseasePageVO) {
@@ -52,9 +52,7 @@ public class KlDiseaseController {
     }
 
     @ApiOperation(value = "诊断依据-获取详情[by:kongwz]",
-            notes = "disName: 诊断名称<br>"+
-    "types: 关系类型（501:疾病相关主症状 502:疾病相关次症状 503:疾病相关体格检查结果 504:疾病相关实验室检查套餐" +
-                    "505:疾病相关辅助检查项目,506:疾病相关药物治疗,507:疾病相关手术治疗,508:疾病相关鉴别诊断）")
+            notes = "disName: 诊断名称<br>")
     @PostMapping("/getDetail")
     @SysLogger("getDetail")
     public RespDTO<DiseaseTreeDetailDTO> getDetail(@Valid @RequestBody GetDiseaseDetailVO getDiseaseDetailVO) {
@@ -62,7 +60,10 @@ public class KlDiseaseController {
         return RespDTO.onSuc(diseaseTreeDetailDTO);
     }
 
-    @ApiOperation(value = "查询诊断依据相关的类型术语[by:kongwz]")
+    @ApiOperation(value = "查询诊断依据相关的类型术语[by:kongwz]",
+            notes = "name: 查询术语的名称<br>" +
+                    "libType: 查询术语的词性<br>" +
+                    "excludedConceptIds: 需要排除的概念id集合")
     @PostMapping("/searchConcept")
     @SysLogger("searchConcept")
     public RespDTO<GetAllForRelationDTO> searchConcept(@Valid @RequestBody SearchConceptVO searchConceptVO) {
@@ -70,7 +71,12 @@ public class KlDiseaseController {
         return RespDTO.onSuc(getAllForRelationDTOS);
     }
 
-    @ApiOperation(value = "诊断依据保存[by:kongwz]")
+    @ApiOperation(value = "诊断依据保存[by:kongwz]",
+            notes = "sid: 第一层的概念id <br>" +
+                    "rid: 第一层的关系id <br>" +
+                    "eid: 第二层的概念id <br>" +
+                    "srid: 第二层的关系id <br>" +
+                    "eids: 第三层的概念id")
     @PostMapping("/save")
     @SysLogger("save")
     public RespDTO<Boolean> save(@Valid @RequestBody List<KlRelationSaveVO> klRelationSaveVOs) {

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

@@ -32,7 +32,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/multContact")
 @SuppressWarnings("unchecked")
-@Api(value = "树形结构维护相关API", tags = { "知识库标准化-树形结构维护相关API" })
+@Api(value = "树形结构维护相关API", tags = {"知识库标准化-树形结构维护相关API"})
 public class TreeContactController {
     @Autowired
     private RelationContactFacade relationContactFacade;
@@ -42,28 +42,33 @@ public class TreeContactController {
     private KlRelationFacade klRelationFacade;
 
 
-    @ApiOperation(value = "知识库标准化-树形结构维护相关API-详情(根据类别查询)[by:kongwz]")
-    @PostMapping("/relationContactDetail")
-    @SysLogger("relationContactDetail")
-    public RespDTO<RelationNodeDTO> relationContactDetail(@Valid @RequestBody RelationContactDetailVO relationContactDetailVO) {
-        return RespDTO.onSuc(relationContactFacade.relationContactDetail(relationContactDetailVO));
-    }
-
-    @ApiOperation(value = "知识库标准化-树形结构维护相关API-详情(根据类别查询)[by:kongwz]")
+    @ApiOperation(value = "知识库标准化-树形结构维护相关API-详情(根据类别查询)[by:kongwz]",
+            notes = "type :类型 <br> " +
+                    "{1:药品化学物质类别    2:药品治疗学类别   3:药品药理学类别   4:药品解剖学类别   5:症状类别" +
+                    "6:手术和操作类别  7:实验室检查类别   8:辅助检查类别" +
+                    "}")
     @PostMapping("/getTree")
     @SysLogger("getTree")
     public RespDTO<TreeAllDTO> getTree(@RequestBody TreeVO treeVO) {
         return RespDTO.onSuc(klRelationFacade.getTree(treeVO));
     }
 
-    @ApiOperation(value = "知识库标准化-获取所有概念(术语关系维护时筛选使用)[by:kongwz]")
+    @ApiOperation(value = "知识库标准化-获取所有概念(术语关系维护时筛选使用)[by:kongwz]",
+            notes = "excludedConceptIds: 要筛选掉的概念id <br>" +
+                    "name: 要搜索的名字 <br>" +
+                    "typeId: 要搜索的类型")
     @PostMapping("/getAllForRelation")
     @SysLogger("getAllForRelation")
     public RespDTO<List<GetAllForRelationDTO>> getAllForRelation(@RequestBody GetAllForRelationVO getAllForRelationVO) {
         return RespDTO.onSuc(klConceptFacade.getAllForRelation(getAllForRelationVO));
     }
 
-    @ApiOperation(value = "知识库标准化-医学术语多层关联维护-添加或者编辑[by:kongwz]")
+    @ApiOperation(value = "知识库标准化-医学术语多层关联维护-添加或者编辑[by:kongwz]",
+            notes = "sid: 第一层的概念id <br>" +
+                    "rid: 第一层的关系id <br>" +
+                    "eid: 第二层的概念id <br>" +
+                    "srid: 第二层的关系id <br>" +
+                    "eids: 第三层的概念id")
     @PostMapping("/addRelation")
     @SysLogger("addRelation")
     public RespDTO<Boolean> addRelation(@Valid @RequestBody List<KlRelationSaveVO> klRelationSaveVOs) {