传参非空

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/AccountFormData.java

@@ -2,6 +2,8 @@ package com.openhis.web.chargemanage.dto;
 
 import java.math.BigDecimal;
 
+import javax.validation.constraints.NotNull;
+
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.openhis.common.enums.AccountBillingStatus;
@@ -10,8 +12,6 @@ import com.openhis.common.enums.AccountStatus;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotBlank;
-
 /**
  * 就诊账号 表单数据
  */
@@ -26,7 +26,7 @@ public class AccountFormData {
     private Long encounterId;
 
     /** 患者id */
-    @NotBlank(message = "患者id不能为空")
+    @NotNull(message = "患者id不能为空")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long patientId;
 
@@ -37,7 +37,7 @@ public class AccountFormData {
     private Integer billingStatusEnum;
 
     /** 账户类型编码 */
-    @NotBlank(message = "账户类型不能为空")
+    @NotNull(message = "账户类型不能为空")
     private String typeCode; // 1:个人现金账户, 2:医保账户
 
     /** 名称 */

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ChargeItemFormData.java

@@ -3,6 +3,8 @@ package com.openhis.web.chargemanage.dto;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import javax.validation.constraints.NotNull;
+
 import com.core.common.utils.SecurityUtils;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -13,8 +15,6 @@ import com.openhis.common.enums.EncounterClass;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotBlank;
-
 /**
  * 费用项管理 表单数据
  */
@@ -29,7 +29,7 @@ public class ChargeItemFormData {
     private Long encounterId;
 
     /** 患者id */
-    @NotBlank(message = "患者id不能为空")
+    @NotNull(message = "患者id不能为空")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long patientId;
 
@@ -50,7 +50,7 @@ public class ChargeItemFormData {
     private Long performerId;
 
     /** 费用定价ID */
-    @NotBlank(message = "费用定价ID不能为空")
+    @NotNull(message = "费用定价ID不能为空")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long definitionId;
 
@@ -65,12 +65,12 @@ public class ChargeItemFormData {
     private String serviceTable;
 
     /** 医疗服务ID */
-    @NotBlank(message = "医疗服务ID不能为空")
+    @NotNull(message = "医疗服务ID不能为空")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long serviceId;
 
     /** 总价 */
-    @NotBlank(message = "总价不能为空")
+    @NotNull(message = "总价不能为空")
     private BigDecimal totalPrice;
 
     /** 关联账户ID */

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterFormData.java

@@ -1,5 +1,7 @@
 package com.openhis.web.chargemanage.dto;
 
+import javax.validation.constraints.NotNull;
+
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.openhis.common.enums.*;
@@ -7,8 +9,6 @@ import com.openhis.common.enums.*;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotBlank;
-
 /**
  * 就诊 表单数据
  */
@@ -19,7 +19,7 @@ public class EncounterFormData {
     /**
      * 患者ID
      */
-    @NotBlank(message = "患者ID不能为空")
+    @NotNull(message = "患者ID不能为空")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long patientId;
 
@@ -41,7 +41,7 @@ public class EncounterFormData {
     /**
      * 优先级编码
      */
-    @NotBlank(message = "优先级编码不能为空")
+    @NotNull(message = "优先级编码不能为空")
     private Integer priorityEnum;
 
     /**
@@ -52,7 +52,7 @@ public class EncounterFormData {
     /**
      * 服务ID
      */
-    @NotBlank(message = "服务ID不能为空")
+    @NotNull(message = "服务ID不能为空")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long serviceTypeId;
 
@@ -64,7 +64,7 @@ public class EncounterFormData {
     /**
      * 机构ID
      */
-    @NotBlank(message = "机构ID不能为空")
+    @NotNull(message = "机构ID不能为空")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long organizationId;
 

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterLocationFormData.java

@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * 就诊位置 表单数据
@@ -26,7 +27,7 @@ public class EncounterLocationFormData {
     /**
      * 位置ID
      */
-    @NotBlank(message = "位置ID不能为空")
+    @NotNull(message = "位置ID不能为空")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long locationId;
 

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterParticipantFormData.java

@@ -1,6 +1,7 @@
 package com.openhis.web.chargemanage.dto;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -26,7 +27,7 @@ public class EncounterParticipantFormData {
     private String typeCode;
 
     /** 参与者ID */
-    @NotBlank(message = "参与者ID不能为空")
+    @NotNull(message = "参与者ID不能为空")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long practitionerId;
 

openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/OutpatientRegistrationAddParam.java

@@ -1,5 +1,7 @@
 package com.openhis.web.chargemanage.dto;
 
+import javax.validation.Valid;
+
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -13,6 +15,7 @@ public class OutpatientRegistrationAddParam {
     /**
      * 就诊管理-表单数据
      */
+    @Valid
     private EncounterFormData encounterFormData;
 
     // /**
@@ -23,20 +26,24 @@ public class OutpatientRegistrationAddParam {
     /**
      * 就诊位置管理-表单数据
      */
+    @Valid
     private EncounterLocationFormData encounterLocationFormData;
 
     /**
      * 就诊参数者管理-表单数据
      */
+    @Valid
     private EncounterParticipantFormData encounterParticipantFormData;
 
     /**
      * 就诊账户管理-表单数据
      */
+    @Valid
     private AccountFormData accountFormData;
     /**
      * 费用项管理-表单数据
      */
+    @Valid
     private ChargeItemFormData chargeItemFormData;
 
 }