From 6398ac4a3b9cf7d9f36756307aa1448e1e215e0c Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <279049017@qq.com> Date: Wed, 25 Nov 2020 09:12:42 +0800 Subject: [PATCH] 添加taocan 的功能,继续完善 --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java | 33 +++++++++++++++++++++++++++------ 1 files changed, 27 insertions(+), 6 deletions(-) diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java index 9875672..70cd685 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java @@ -11,6 +11,7 @@ import org.hibernate.validator.constraints.NotEmpty; import org.springframework.format.annotation.DateTimeFormat; +import javax.validation.constraints.NotNull; import java.util.Date; /** @@ -35,6 +36,7 @@ /** * 诊断医生所在科室 */ + @NotEmpty(message = "科室的名称不能为空") private String createHospitalDepartment; /** * 科室的唯一标识 @@ -44,21 +46,31 @@ /** * 创建医院的唯一标识 */ - @NotEmpty(message = "创建医院的唯一标识不能为空") + @NotNull(message = "创建医院的唯一标识不能为空") private Long createHospitalId; /** * 创建医院名称 */ + @NotEmpty(message = "医院名称不能为空") private String createHospitalName; + /** + * 医生id + */ + @NotEmpty(message = "医生id不能为空") + private String createDoctorId; /** + * 医生姓名 + */ + @NotEmpty(message = "医生姓名不能为空") + private String createDoctorName; /** * 金额 (单位为分) */ - @NotEmpty(message = "金额 (单位为分)不能为空") + private Integer payPrice; /** * 内部订单号 */ - @NotEmpty(message = "内部订单号不能为空") + private String outTradeNo; /** * 支付完成时间 @@ -77,6 +89,7 @@ */ @NotEmpty(message = "关联诊断记录ID不能为空") private String diaId; + /** * 孩子的id */ @@ -103,11 +116,19 @@ */ private Boolean type; + private String childName; + /** + * 孩子的出生日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Asia/Shanghai") + private Date childBirthday; + /** + * 孩子的性别 + */ + private Integer childSex; + @JsonSerialize( using = ToStringSerializer.class - ) - @TableId( - type = IdType.ASSIGN_ID ) @DateTimeFormat( pattern = "yyyy-MM-dd HH:mm:ss" -- Gitblit v1.8.0