Merge branch 'dev/nurseRule20220329' into debug

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

@@ -14,11 +14,12 @@ import java.util.List;
  */
 @Getter
 @Setter
-@ToString(exclude = { "ruleGroup", "msg", "description" }, includeFieldNames = false)
+@ToString(exclude = { "ruleGroup", "msg", "description", "names" }, includeFieldNames = false)
 public class RuleConditionDTO {
     private Integer hasSubCond;
     private String ruleGroup;
     private String msg;
     private String description;
+    private List<String> names; //静态信息名称列表
     private List<RuleBaseDTO> ruleBaseDTOList = new ArrayList<>();
 }

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

@@ -26,4 +26,6 @@ public class RuleQueryKeyVO {
     private String baseLibName;
     //基础规则术语类型
     private Integer baseLibType;
+    //关联静态信息名称
+    private String staticName;
 }

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

@@ -24,4 +24,6 @@ public class RuleQueryVO extends Page {
     private String baseLibName;
     //基础规则术语类型
     private Integer baseLibType;
+    //关联静态信息名称
+    private String staticName;
 }

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

@@ -32,4 +32,9 @@ public class StaticKnowledgeIndexVO {
      */
     @ApiModelProperty(hidden = true)
     private Integer hasInfo;
+
+    /**
+     * 去重id
+     */
+    private List<Long> notInIds;
 }

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

@@ -93,8 +93,8 @@ public class KlRuleController {
                     "libType: 术语类型<br>" +
                     "ruleType: 规则类型<br>" +
                     "description: 规则名称<br>" +
-                    "baseLibName: 基础医学标准术语<br>" +
-                    "baseLibType: 基础规则术语类型")
+                    "baseLibType: 基础规则术语类型<br>" +
+                    "staticName: 关联静态信息名称")
     @PostMapping("/getRulePage")
     @SysLogger("getRulePage")
     public RespDTO<Page<RuleQueryDTO>> getRulePage(@RequestBody RuleQueryVO ruleQueryVO) {
@@ -107,7 +107,8 @@ public class KlRuleController {
                     "ruleType: 规则类型<br>" +
                     "description: 规则名称<br>" +
                     "baseLibName: 基础医学标准术语<br>" +
-                    "baseLibType: 基础规则术语类型")
+                    "baseLibType: 基础规则术语类型<br>" +
+                    "staticName: 关联静态信息名称")
     @PostMapping("/getRuleDetail")
     @SysLogger("getRuleDetail")
     public RespDTO<RuleDTO> getRuleDetail(@RequestBody @Valid RuleQueryKeyVO ruleQueryKeyVO) {