diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/AccountFormData.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/AccountFormData.java index afae30a6..1dd8f619 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/AccountFormData.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/AccountFormData.java @@ -10,6 +10,8 @@ import com.openhis.common.enums.AccountStatus; import lombok.Data; import lombok.experimental.Accessors; +import javax.validation.constraints.NotBlank; + /** * 就诊账号 表单数据 */ @@ -24,6 +26,7 @@ public class AccountFormData { private Long encounterId; /** 患者id */ + @NotBlank(message = "患者id不能为空") @JsonSerialize(using = ToStringSerializer.class) private Long patientId; @@ -34,6 +37,7 @@ public class AccountFormData { private Integer billingStatusEnum; /** 账户类型编码 */ + @NotBlank(message = "账户类型不能为空") private String typeCode; // 1:个人现金账户, 2:医保账户 /** 名称 */ diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ChargeItemFormData.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ChargeItemFormData.java index 15e9ee34..64829cfb 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ChargeItemFormData.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ChargeItemFormData.java @@ -13,6 +13,8 @@ import com.openhis.common.enums.EncounterClass; import lombok.Data; import lombok.experimental.Accessors; +import javax.validation.constraints.NotBlank; + /** * 费用项管理 表单数据 */ @@ -27,6 +29,7 @@ public class ChargeItemFormData { private Long encounterId; /** 患者id */ + @NotBlank(message = "患者id不能为空") @JsonSerialize(using = ToStringSerializer.class) private Long patientId; @@ -47,6 +50,7 @@ public class ChargeItemFormData { private Long performerId; /** 费用定价ID */ + @NotBlank(message = "费用定价ID不能为空") @JsonSerialize(using = ToStringSerializer.class) private Long definitionId; @@ -61,10 +65,12 @@ public class ChargeItemFormData { private String serviceTable; /** 医疗服务ID */ + @NotBlank(message = "医疗服务ID不能为空") @JsonSerialize(using = ToStringSerializer.class) private Long serviceId; /** 总价 */ + @NotBlank(message = "总价不能为空") private BigDecimal totalPrice; /** 关联账户ID */