diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/consultationInfo/ConsultationInfoDTO.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/consultationInfo/ConsultationInfoDTO.java index 6470f57..f1cf7c0 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/consultationInfo/ConsultationInfoDTO.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/consultationInfo/ConsultationInfoDTO.java @@ -10,6 +10,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.time.LocalTime; @@ -50,7 +51,7 @@ public class ConsultationInfoDTO extends BaseEntity implements Serializable { * 患者身份证号 */ @ApiModelProperty("患者身份证号") - @NotNull(message = "患者身份证号不能为空", groups = {Insert.class, Update.class}) + @NotBlank(message = "患者身份证号不能为空", groups = {Insert.class, Update.class}) @Length(max = 18, message = "身份证号不能超过18位", groups = {Insert.class, Update.class}) private String cardNo; @@ -58,7 +59,7 @@ public class ConsultationInfoDTO extends BaseEntity implements Serializable { * 患者联系方式 */ @ApiModelProperty("患者联系方式") - @NotNull(message = "患者联系方式不能为空", groups = {Insert.class, Update.class}) + @NotBlank(message = "患者联系方式不能为空", groups = {Insert.class, Update.class}) @Length(max = 11, message = "联系方式不能超过11位", groups = {Insert.class, Update.class}) private String phone; @@ -66,7 +67,7 @@ public class ConsultationInfoDTO extends BaseEntity implements Serializable { * 现住址所在地区 */ @ApiModelProperty("现住址所在地区") - @NotNull(message = "患者信息不能为空", groups = {Insert.class, Update.class}) + @NotBlank(message = "患者信息不能为空", groups = {Insert.class, Update.class}) @Length(max = 100, message = "现住址所在地区不能超过100位", groups = {Insert.class, Update.class}) private String address; @@ -74,7 +75,7 @@ public class ConsultationInfoDTO extends BaseEntity implements Serializable { * 医生id(签约医生/专家) */ @ApiModelProperty("医生id(签约医生/专家)") - @NotNull(message = "医生信息不能为空", groups = {Insert.class, Update.class}) + @NotBlank(message = "医生信息不能为空", groups = {Insert.class, Update.class}) private String doctorId; /** @@ -87,7 +88,7 @@ public class ConsultationInfoDTO extends BaseEntity implements Serializable { * 问诊类型,图文问诊:IMAGE_TEXT_CONSULTATION,视频问诊:VIDEO_CONSULTATION */ @ApiModelProperty("问诊类型,图文问诊:IMAGE_TEXT_CONSULTATION,视频问诊:VIDEO_CONSULTATION") - @NotNull(message = "问诊类型不能为空", groups = {Insert.class, Update.class}) + @NotBlank(message = "问诊类型不能为空", groups = {Insert.class, Update.class}) private String consultationType; @@ -122,7 +123,7 @@ public class ConsultationInfoDTO extends BaseEntity implements Serializable { * 问题简述 */ @ApiModelProperty("问题简述") - @NotNull(message = "问题简述不能为空", groups = {Insert.class, Update.class}) + @NotBlank(message = "问题简述不能为空", groups = {Insert.class, Update.class}) @Length(max = 5, message = "问题简述不能超过5位", groups = {Insert.class, Update.class}) private String problemDescription; @@ -130,7 +131,7 @@ public class ConsultationInfoDTO extends BaseEntity implements Serializable { * 患者个体情况说明 */ @ApiModelProperty("患者个体情况说明") - @NotNull(message = "患者个体情况说明不能为空", groups = {Insert.class, Update.class}) + @NotBlank(message = "患者个体情况说明不能为空", groups = {Insert.class, Update.class}) @Length(max = 100, message = "患者个体情况说明不能超过100位", groups = {Insert.class, Update.class}) private String situationDescription; @@ -138,7 +139,7 @@ public class ConsultationInfoDTO extends BaseEntity implements Serializable { * 问题描述 */ @ApiModelProperty("问题描述") - @NotNull(message = "问题描述不能为空", groups = {Insert.class, Update.class}) + @NotBlank(message = "问题描述不能为空", groups = {Insert.class, Update.class}) @Length(max = 500, message = "问题描述不能超过500位", groups = {Insert.class, Update.class}) private String problemStatement; @@ -146,7 +147,7 @@ public class ConsultationInfoDTO extends BaseEntity implements Serializable { * 病历 */ @ApiModelProperty("病历") - @NotNull(message = "病历不能为空", groups = {Insert.class, Update.class}) + @NotBlank(message = "病历不能为空", groups = {Insert.class, Update.class}) @Length(max = 100, message = "病历不能超过100位", groups = {Insert.class, Update.class}) private String medicalRecord;