Browse Source

树形结构支持多种

gaodm 5 years ago
parent
commit
778bc405bc

+ 9 - 3
ltkg-service/src/main/java/com/diagbot/facade/KgFacade.java

@@ -115,8 +115,11 @@ public class KgFacade extends KgServiceImpl {
 
     public TreeDTO getTreeFac(KgTreeVO kgTreeVO) {
         TreeDTO treeDTO = new TreeDTO();
-        if (kgTreeVO.getType() == 1
-                && kgTreeVO.getSubType() == 1) {
+        if ((kgTreeVO.getType() == 1
+                && (kgTreeVO.getSubType() == 1 || kgTreeVO.getSubType() == 2 || kgTreeVO.getSubType() == 3))
+                || (kgTreeVO.getType() == 2 && (kgTreeVO.getSubType() == 0))
+                || (kgTreeVO.getType() == 3 && (kgTreeVO.getSubType() == 0))
+                || (kgTreeVO.getType() == 4 && (kgTreeVO.getSubType() == 0))) {
             // KgQueryVO kgQueryVO = new KgQueryVO();
             // kgQueryVO.setLabelName("诊断依据");
             // kgQueryVO.setInputStr("诊断依据");
@@ -124,7 +127,10 @@ public class KgFacade extends KgServiceImpl {
             PresetInfo presetInfo = presetInfoFacade.getOne(new QueryWrapper<PresetInfo>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
                     .eq("type", (kgTreeVO.getType() * 10 + kgTreeVO.getSubType())), false);
-            String tree = presetInfo.getContent();
+            String tree = "";
+            if (null != presetInfo){
+                tree = presetInfo.getContent();
+            }
             if (StringUtil.isBlank(tree)) {
                 throw new CommonException(CommonErrorCode.NOT_EXISTS);
             } else {

+ 2 - 2
ltkg-service/src/main/java/com/diagbot/vo/KgTreeVO.java

@@ -14,10 +14,10 @@ import javax.validation.constraints.NotNull;
 @Getter
 @Setter
 public class KgTreeVO {
-    @ApiModelProperty(value = "类型 疾病:1")
+    @ApiModelProperty(value = "类型")
     @NotNull(message = "类型不能为空")
     private Integer type;
-    @ApiModelProperty(value = "子类型 默认:0 ICD10:1")
+    @ApiModelProperty(value = "子类型 默认:0")
     @NotNull(message = "子类型不能为空")
     private Integer subType;
 }

+ 3 - 1
ltkg-service/src/main/java/com/diagbot/web/KgController.java

@@ -56,7 +56,9 @@ public class KgController {
         return RespDTO.onSuc(kgFacade.getGraphFac(kgQueryVO));
     }
 
-    @ApiOperation(value = "获取树形分类", notes = "获取树形分类")
+    @ApiOperation(value = "获取树形分类",
+            notes = "获取树形分类(疾病ICD10:t:1,st:1)" +
+                    "(疾病科室:t:1,st:2)")
     @PostMapping("/getTree")
     @SysLogger("getTree")
     @Cacheable(value = KGTREECACHE, key = "'kgtree:t_' + #kgTreeVO.type + '_st_' + #kgTreeVO.subType")