修改代码

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

@@ -85,20 +85,20 @@ public class KlRuleFacade extends KlRuleServiceImpl {
         int count = this.count(new QueryWrapper<KlRule>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("description", klRuleInfoSaveVO.getParDescription())
-                .ne("id", klRuleInfoSaveVO.getId() == null ? -1 : klRuleInfoSaveVO.getId()));
+                .ne("id", klRuleInfoSaveVO.getParId() == null ? -1 : klRuleInfoSaveVO.getParId()));
         if (count > 0) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该规则名称已存在");
         }
         //校验数据是否还在
-        if (null != klRuleInfoSaveVO.getId()) {
+        if (null != klRuleInfoSaveVO.getParId()) {
             int sum = this.count(new QueryWrapper<KlRule>().eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .eq("id", klRuleInfoSaveVO.getId()));
+                    .eq("id", klRuleInfoSaveVO.getParId()));
             if (sum == 0) {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该数据已不存在！");
             }
             UpdateWrapper<KlRule> klRuleUpdate = new UpdateWrapper<>();
             klRuleUpdate.eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .eq("id", klRuleInfoSaveVO.getId())
+                    .eq("id", klRuleInfoSaveVO.getParId())
                     .set(StringUtil.isNotBlank(klRuleInfoSaveVO.getParDescription()), "description", klRuleInfoSaveVO.getParDescription())
                     .set(StringUtil.isNotBlank(klRuleInfoSaveVO.getParConceptId().toString()), "concept_id", klRuleInfoSaveVO.getParConceptId())
                     .set(StringUtil.isNotBlank(klRuleInfoSaveVO.getParRuleType().toString()), "rule_type", klRuleInfoSaveVO.getParRuleType())
@@ -109,7 +109,7 @@ public class KlRuleFacade extends KlRuleServiceImpl {
             res = this.update(klRuleUpdate);
 
             //先删除原有的详情;
-            res = clearSub(klRuleInfoSaveVO.getId());
+            res = clearSub(klRuleInfoSaveVO.getParId());
             if (ListUtil.isNotEmpty(klRuleInfoSaveVO.getKlRuleInfoSaveSub())) {
                 //再重新传入的详情保存
                 res = saveCommon(klRuleInfoSaveVO);
@@ -128,7 +128,7 @@ public class KlRuleFacade extends KlRuleServiceImpl {
             res = this.save(klRule);
             if (res) {
                 //再保存附表
-                klRuleInfoSaveVO.setId(klRule.getId());
+                klRuleInfoSaveVO.setParId(klRule.getId());
                 res = saveCommon(klRuleInfoSaveVO);
             }
         }
@@ -208,7 +208,7 @@ public class KlRuleFacade extends KlRuleServiceImpl {
                         klRuleCondition.setGmtCreate(now);
                         klRuleCondition.setGroupType(data2.getGroupType());
                         klRuleCondition.setRuleBaseId(data1.getId());
-                        klRuleCondition.setRuleId(klRuleInfoSaveVO.getId());
+                        klRuleCondition.setRuleId(klRuleInfoSaveVO.getParId());
                         klRuleConditionList.add(klRuleCondition);
                     }
                 }

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

@@ -1,9 +1,12 @@
 package com.diagbot.vo;
 
 import com.diagbot.dto.KlRuleByIdSubDTO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -14,13 +17,18 @@ import java.util.List;
 @Setter
 @Getter
 public class KlRuleInfoSaveVO {
-    private Long id;
+    private Long parId;
+    @NotBlank(message = "请输入规则名称")
     private String parDescription;//规则名称
+    @NotNull(message = "请输入规则类型")
     private Integer parRuleType;//规则类型(1:开单合理性;2:高危;3:危急值;4:其他值提醒;5:其他值提醒输血;6:正常项目重复开立)
+    @NotNull(message = "请输入概念id")
     private Long parConceptId;//提示概念id
+    @NotNull(message = "请输入概念id")
     private Integer parHasSub;//是否有子条件（0：无，1：有）
     private String parMsg;//附加信息
-    private Integer parStatus;//启用状态（0：禁用，1：启用）
+    @ApiModelProperty(hidden = true)
+    private Integer parStatus = 1;//启用状态（0：禁用，1：启用）
 /*    private String parlibName;
     private String parLenName;
     private String parLenCode;*/