Merge remote-tracking branch 'origin/dev/nurseRule20220329' into dev/nurseRule20220329

src/main/java/com/diagbot/dto/IndicationDTO.java

@@ -22,6 +22,8 @@ public class IndicationDTO {
     private List<BillMsg> highRiskList = new ArrayList<>();
     // 其他提醒
     private List<BillMsg> otherList = new ArrayList<>();
+    // 护理提醒
+    private List<BillMsg> nurseList = new ArrayList<>();
     // 记录调试信息
     private Map<String, Object> debug = new LinkedHashMap<>();
 }

src/main/java/com/diagbot/dto/KlRuleByIdGroupDTO.java

@@ -0,0 +1,22 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: wangfeng
+ * @time: 2022-03-30 11:30
+ */
+@Setter
+@Getter
+public class KlRuleByIdGroupDTO {
+
+    private Integer groupType;
+
+    private List<KlRuleStaticSubDTO> KlRuleStaticSub;
+
+    private List<KlRuleByIdSubDTO> klRuleByIdSub;
+}

src/main/java/com/diagbot/dto/KlRuleByIdParDTO.java

@@ -23,5 +23,5 @@ public class KlRuleByIdParDTO {
     private Integer parStatus;//启用状态（0：禁用，1：启用）
     private String parLenName;
     private String parLenCode;
-    private List<KlRuleByIdSubDTO>  klRuleByIdSub;
+    private List<KlRuleByIdGroupDTO> klRuleByIdGroup;
 }

src/main/java/com/diagbot/dto/KlRuleStaticSubDTO.java

@@ -0,0 +1,19 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangfeng
+ * @time: 2022-03-30 11:30
+ */
+@Setter
+@Getter
+public class KlRuleStaticSubDTO {
+    private Long ruleId;
+    private Integer groupType;
+    private Long conceptId;
+    private String name;
+    private Integer ordeNo;
+}

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

@@ -0,0 +1,23 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: wangfeng
+ * @time: 2022-03-30 11:32
+ */
+@Setter
+@Getter
+public class KlRuleInfoSaveGroupVO {
+
+    private Integer groupType;//规则组别
+
+    private List<KlRuleInfoSaveSubVO> klRuleInfoSaveSub;//规则明细条目
+
+
+    private List<RuleStaticSubVO> ruleStatic;//关联静态知识
+}

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

@@ -32,5 +32,5 @@ public class KlRuleInfoSaveVO {
         private String parLenName;
         private String parLenCode;*/
     private String modifier;
-    private List<KlRuleInfoSaveSubVO> klRuleInfoSaveSub;
+    private List<KlRuleInfoSaveGroupVO> klRuleInfoSaveGroup;
 }

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

@@ -0,0 +1,23 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangfeng
+ * @time: 2022-03-30 11:32
+ */
+@Setter
+@Getter
+public class RuleStaticSubVO {
+    /**
+     * 静态信息概念id
+     */
+    private Long conceptId;
+
+    /**
+     * 显示顺序
+     */
+    private Integer orderNo;
+}