高危手术导入

src/main/java/com/diagbot/entity/KlRule.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * </p>
  *
  * @author gaodm
- * @since 2021-01-25
+ * @since 2021-01-26
  */
 public class KlRule implements Serializable {
 
@@ -64,6 +64,11 @@ public class KlRule implements Serializable {
      */
     private Integer ruleType;
 
+    /**
+     * 是否有子条件（0：无，1：有）
+     */
+    private Integer hasSubCond;
+
     /**
      * 启用状态（0：禁用，1：启用）
      */
@@ -146,6 +151,14 @@ public class KlRule implements Serializable {
         this.ruleType = ruleType;
     }
 
+    public Integer getHasSubCond() {
+        return hasSubCond;
+    }
+
+    public void setHasSubCond(Integer hasSubCond) {
+        this.hasSubCond = hasSubCond;
+    }
+
     public Integer getStatus() {
         return status;
     }
@@ -174,6 +187,7 @@ public class KlRule implements Serializable {
                 ", conceptId=" + conceptId +
                 ", description=" + description +
                 ", ruleType=" + ruleType +
+                ", hasSubCond=" + hasSubCond +
                 ", status=" + status +
                 ", msg=" + msg +
                 "}";

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

@@ -0,0 +1,19 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2021/1/26 16:45
+ */
+@Getter
+@Setter
+public class KlRuleAnalyVO {
+    private List<KlRuleConditionVO> condList = new ArrayList<>();
+    private List<String> noCondList = new ArrayList<>();
+}

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

@@ -0,0 +1,22 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2021/1/26 16:44
+ */
+@Getter
+@Setter
+public class KlRuleConditionVO {
+    //名称
+    private String name;
+    //比较符
+    private String operator;
+    //值
+    private String value;
+    //单位
+    private String unit;
+}

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

@@ -2,6 +2,7 @@ package com.diagbot.web;
 
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.ExportFacade;
+import com.diagbot.vo.TestAllVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,4 +47,11 @@ public class ExportController {
     public RespDTO<Map<String, Object>> diagnoseImport(@RequestParam("file") MultipartFile file) {
         return RespDTO.onSuc(exportFacade.importExcel(file));
     }
+
+    @ApiOperation(value = "提示信息导入[gaodm]",
+            notes = "")
+    @PostMapping("/importExcelTip")
+    public RespDTO<Map<String, Object>> importExcelTip(TestAllVO testAllVO) {
+        return RespDTO.onSuc(exportFacade.importExcelTip(testAllVO));
+    }
 }