注释修改

src/main/java/com/diagbot/facade/KlDiagnoseFacade.java

@@ -20,6 +20,7 @@ import com.diagbot.vo.KlDiagnoseByIdVO;
 import com.diagbot.vo.KlDiagnoseClearVO;
 import com.diagbot.vo.KlDiagnoseInfoVO;
 import com.diagbot.vo.KlDiagnoseSatarDisVO;
+import com.diagbot.vo.KlDiagnoseSaveVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -130,4 +131,9 @@ public class KlDiagnoseFacade extends KlDiagnoseServiceImpl {
                 .set("gmt_modified", now);
         return this.update(new KlDiagnose(), klKlDiagnoseUpdate);
     }
+
+    public Boolean saveDiagnoseAll(KlDiagnoseSaveVO klDiagnoseSaveVO) {
+
+        return null;
+    }
 }

src/main/java/com/diagbot/vo/KlDiagnoseDetailVO.java

@@ -0,0 +1,88 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2021-03-23 9:45
+ */
+@Setter
+@Getter
+public class KlDiagnoseDetailVO {
+
+    private String description;//规则名称
+    private Long conceptId;//提示概念id
+    private String libName;
+    private Integer libType;
+    private String lename;
+    private Integer status;//启用状态（0：禁用，1：启用）
+    /**
+     * 条件类型(1:基础条件；2:拟诊条件；3:确诊条件；4:警惕条件)
+     */
+    private Integer conditionType;
+
+    /**
+     * 规则组别（condition_type为2:拟诊条件；3:确诊条件；4:警惕条件有效）
+     */
+    private Integer conditionGroup;
+
+    /**
+     * 符合数量（condition_type为2:拟诊条件；3:确诊条件；4:警惕条件有效）
+     */
+    private Integer fitNo;
+    /**
+     * 基础规则组别（condition_type为1:基础条件；2:拟诊条件；3:确诊条件；4:警惕条件都有效）
+     */
+    private Integer baseGroup;
+    /**
+     * 描述
+     */
+    private String basDescription;
+    private Long basConceptId;
+    private String basLibName;
+    private Integer basLibType;
+    private String basLename;
+    /**
+     * 基础规则类型(1:等于术语本身;2:存在比较;3:不等于术语本身;)
+     */
+    private Integer basType;
+    /**
+     * 最小域比较符
+     */
+    private String minOperator;
+    /**
+     * 最小域值
+     */
+    private String minVal;
+
+    /**
+     * 最小域单位
+     */
+    private String minUnit;
+    /**
+     * 最大域比较符
+     */
+    private String maxOperator;
+    /**
+     * 最大域值
+     */
+    private String maxVal;
+    /**
+     * 最大域单位
+     */
+    private String maxUnit;
+    /**
+     * 等于域比较符
+     */
+    private String eqOperator;
+    /**
+     * 等于域值
+     */
+    private String eqValue;
+    /**
+     * 等于域单位
+     */
+    private String eqUnit;
+}

src/main/java/com/diagbot/vo/KlDiagnoseGroupVO.java

@@ -0,0 +1,33 @@
+package com.diagbot.vo;
+
+import com.diagbot.dto.KlDiagnoseByIdDTO;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2021-03-23 9:43
+ */
+@Setter
+@Getter
+public class KlDiagnoseGroupVO {
+    /**
+     * 基础规则组别（condition_type为1:基础条件；2:拟诊条件；3:确诊条件；4:警惕条件都有效）
+     */
+    private Integer baseGroup;
+    /**
+     * 满足的条件
+     */
+    private Integer fitNo;
+    /**
+     * 上一级的组别
+     */
+    private Integer conditionGroup;
+    /**
+     * 组别里的明细
+     */
+    List<KlDiagnoseByIdDTO> klDiagnoseByIdDTO;
+}

src/main/java/com/diagbot/vo/KlDiagnoseSaveVO.java

@@ -0,0 +1,29 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2021-03-22 17:10
+ */
+@Setter
+@Getter
+public class KlDiagnoseSaveVO {
+    private Long id;
+    /**
+     * 疾病概念id
+     */
+    private Long conceptId;
+    /**
+     * 描述
+     */
+    private String description;
+
+    List<KlDiagnoseTypeVO> klDiagnoseTypeVO;
+
+
+}

src/main/java/com/diagbot/vo/KlDiagnoseTypeVO.java

@@ -0,0 +1,28 @@
+package com.diagbot.vo;
+
+import com.diagbot.dto.KlDiagnoseGroupDTO;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2021-03-23 9:41
+ */
+@Setter
+@Getter
+public class KlDiagnoseTypeVO {
+
+    /**
+     * 条件类型名
+     */
+    private String conditionTypeName;
+    /**
+     * 条件类型(1:基础条件；2:拟诊条件；3:确诊条件；4:警惕条件)
+     */
+    private Integer conditionType;
+
+    List<KlDiagnoseGroupVO> groupVO;
+}

src/main/java/com/diagbot/web/KlDiagnoseController.java

@@ -2,11 +2,8 @@ package com.diagbot.web;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.KlDiagnoseByIdDTO;
 import com.diagbot.dto.KlDiagnoseInfoDTO;
 import com.diagbot.dto.KlDiagnoseTypeDTO;
-import com.diagbot.dto.KlRuleByIdParDTO;
-import com.diagbot.dto.KlRuleInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.enums.StatusEnum;
 import com.diagbot.facade.KlDiagnoseFacade;
@@ -14,11 +11,7 @@ import com.diagbot.vo.KlDiagnoseByIdVO;
 import com.diagbot.vo.KlDiagnoseClearVO;
 import com.diagbot.vo.KlDiagnoseInfoVO;
 import com.diagbot.vo.KlDiagnoseSatarDisVO;
-import com.diagbot.vo.KlRuleByIdVO;
-import com.diagbot.vo.KlRuleInfoClearVO;
-import com.diagbot.vo.KlRuleInfoSaveVO;
-import com.diagbot.vo.KlRuleInfoVO;
-import com.diagbot.vo.KlRuleSatartOrdisaVO;
+import com.diagbot.vo.KlDiagnoseSaveVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,31 +35,31 @@ import java.util.List;
 @SuppressWarnings("unchecked")
 public class KlDiagnoseController {
     @Autowired
-    KlDiagnoseFacade  klDiagnoseFacade;
+    KlDiagnoseFacade klDiagnoseFacade;
 
-    @ApiOperation(value = "分页获取规则维护列表[by:wangfeng]")
+    @ApiOperation(value = "分页获取诊断依据维护列表[by:wangfeng]")
     @PostMapping("/getKlDiagnosePage")
     @SysLogger("getKlDiagnosePage")
     public RespDTO<IPage<KlDiagnoseInfoDTO>> getDiagnosePages(@RequestBody KlDiagnoseInfoVO klRuleInfoVO) {
         return RespDTO.onSuc(klDiagnoseFacade.getKlDiagnoseInfoPage(klRuleInfoVO));
     }
 
-    @ApiOperation(value = "根据规则Id获取规则详情[by:wangfeng]")
+    @ApiOperation(value = "根据Id获取诊断依据详情[by:wangfeng]")
     @PostMapping("/getByIdDiagnose")
     @SysLogger("getByIdDiagnose")
     public RespDTO<List<KlDiagnoseTypeDTO>> getByIdDiagnoseAll(@RequestBody @Valid KlDiagnoseByIdVO klDiagnoseByIdVO) {
         return RespDTO.onSuc(klDiagnoseFacade.getByIdDiagnoseAll(klDiagnoseByIdVO));
     }
-/*
-    @ApiOperation(value = "保存规则详情[by:wangfeng]")
+
+    @ApiOperation(value = "保存诊断依据详情[by:wangfeng]")
     @PostMapping("/saveDiagnose")
     @SysLogger("saveDiagnose")
     @Transactional
-    public RespDTO<Boolean> saveDiagnoseAll(@RequestBody @Valid KlDiagnoseSaveVO klRuleInfoSaveVO) {
-        return RespDTO.onSuc(klDiagnoseFacade.saveDiagnoseAll(klRuleInfoSaveVO));
-    }*/
+    public RespDTO<Boolean> saveDiagnoseAll(@RequestBody @Valid KlDiagnoseSaveVO klDiagnoseSaveVO) {
+        return RespDTO.onSuc(klDiagnoseFacade.saveDiagnoseAll(klDiagnoseSaveVO));
+    }
 
-    @ApiOperation(value = "刪除规则详情[by:wangfeng]")
+    @ApiOperation(value = "刪除诊断依据详情[by:wangfeng]")
     @PostMapping("/clearDiagnose")
     @SysLogger("clearDiagnose")
     @Transactional
@@ -74,17 +67,17 @@ public class KlDiagnoseController {
         return RespDTO.onSuc(klDiagnoseFacade.clearDiagnoseAll(klDiagnoseClearVO));
     }
 
-    @ApiOperation(value = "停用规则[by:wangfeng]")
+    @ApiOperation(value = "停用诊断依据[by:wangfeng]")
     @PostMapping("/disableKlDiagnose")
     @SysLogger("disableKlDiagnose")
     public RespDTO<Boolean> disableDiagnoses(@RequestBody @Valid KlDiagnoseSatarDisVO klDiagnoseSatarDisVO) {
         return RespDTO.onSuc(klDiagnoseFacade.disableDiagnose(klDiagnoseSatarDisVO, StatusEnum.Disable.getKey()));
     }
 
-    @ApiOperation(value = "启用规则[by:wangfeng]")
+    @ApiOperation(value = "启用诊断依据[by:wangfeng]")
     @PostMapping("/startKlDiagnose")
     @SysLogger("startKlDiagnose")
     public RespDTO<Boolean> startKlDiagnoses(@RequestBody @Valid KlDiagnoseSatarDisVO klDiagnoseSatarDisVO) {
-        return RespDTO.onSuc(klDiagnoseFacade.disableDiagnose(klDiagnoseSatarDisVO,StatusEnum.Enable.getKey()));
+        return RespDTO.onSuc(klDiagnoseFacade.disableDiagnose(klDiagnoseSatarDisVO, StatusEnum.Enable.getKey()));
     }
 }