diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java index de76a01..60252b7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java @@ -46,7 +46,7 @@ public class BabyBookbuildingController extends BaseController{ */ @RequestMapping(method = RequestMethod.POST, value = "/addOrUpBabyBuild") @ResponseBody - public BaseResponse addOrUpBabyBuild(@RequestBody BabyBookbuildingAddRequest request) { + public BaseResponse addOrUpBabyBuild(@Valid @RequestBody BabyBookbuildingAddRequest request) { if (request != null && !StringUtils.isEmpty(request.getId())) { return babyBookbuildingFacade.updateBabyBookbuilding(request); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java index 22b2c93..bdc7bd4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java @@ -1,6 +1,8 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.core.annotation.form.Form; +import com.lyms.platform.common.core.annotation.form.FormParam; +import org.hibernate.validator.constraints.NotEmpty; import java.util.List; import java.util.Map; @@ -19,6 +21,8 @@ public class BabyBookbuildingAddRequest { private String mommyName; //证件号号 + @FormParam + @NotEmpty(message = "母亲证件号不能为空") private String mommyCertificateNum; //证件类型 private String mommyCertificateTypeId; @@ -64,8 +68,12 @@ public class BabyBookbuildingAddRequest { //儿童性别 private Integer sex; //儿童身份证 + @FormParam + @NotEmpty(message = "儿童身份证号不能为空") private String babyCardNo; //儿童生日 + @FormParam + @NotEmpty(message = "儿童生日不能为空") private String babyBirthday; //家庭住址 private String homeAddress; @@ -78,6 +86,8 @@ public class BabyBookbuildingAddRequest { /***********儿童出生信息***********/ //预产期 + @FormParam + @NotEmpty(message = "预产期不能为空") private String dueDate; //分娩方式 private String dueType; @@ -106,6 +116,8 @@ public class BabyBookbuildingAddRequest { private String buildDoctor; //建档日期 + @FormParam + @NotEmpty(message = "建档日期不能为空") private String buildDate; //服务类型 @@ -115,8 +127,11 @@ public class BabyBookbuildingAddRequest { private Integer serviceStatus; //就诊卡号 + @FormParam + @NotEmpty(message = "就诊卡号不能为空") private String vcCardNo; + @FormParam private Integer hospitalId; //体验会员 0非体验会员 1体验会员 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java index c4ee731..4d01071 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java @@ -1,5 +1,8 @@ package com.lyms.platform.operate.web.request; +import com.lyms.platform.common.core.annotation.form.FormParam; +import org.hibernate.validator.constraints.NotEmpty; + import java.util.Map; /** @@ -12,6 +15,8 @@ public class BabyCheckRequest { private String id; //建档ID + @FormParam + @NotEmpty(message = "建档ID不能为空.") private String buildId; /******问诊情况****/ @@ -195,6 +200,8 @@ public class BabyCheckRequest { private String checkDoctor; //下次预约 + @FormParam + @NotEmpty(message = "下次预约时间不能为空.") private String nextDate; //是否高危儿童 0 非高危 1高危 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsConfigRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsConfigRequest.java index b3e8bdf..0522170 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsConfigRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsConfigRequest.java @@ -1,5 +1,8 @@ package com.lyms.platform.operate.web.request; +import com.lyms.platform.common.core.annotation.form.FormParam; +import org.hibernate.validator.constraints.NotEmpty; + import java.util.List; import java.util.Map; @@ -11,15 +14,20 @@ public class SmsConfigRequest { private String id; //前缀类型 0医院前缀 1科室前缀 + @FormParam private Integer prefixType; //医院前缀 + @FormParam + @NotEmpty(message = "医院前缀不能为空.") private String hospitalPrefix; //科室前缀 private List> deptPrefix; //指导发送时间 + @FormParam + @NotEmpty(message = "指导发送时间不能为空.") private String guideTime; //消息服务启动 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsTemplateRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsTemplateRequest.java index d04a120..08c0c90 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsTemplateRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsTemplateRequest.java @@ -1,7 +1,9 @@ package com.lyms.platform.operate.web.request; +import com.lyms.platform.common.core.annotation.form.FormParam; import com.lyms.platform.common.dao.BaseQuery; +import org.hibernate.validator.constraints.NotEmpty; /** @@ -13,21 +15,27 @@ public class SmsTemplateRequest extends BaseQuery { //发送对象 枚举定义参考 ServiceObjEnums + @FormParam private Integer serviceObj; //服务类型 参见枚举 ServiceTypeEnums + @FormParam private Integer serviceType; //服务状态 参见枚举ServiceStatusEnums + @FormParam private Integer serviceStatus; //消息类型 参见枚举 SmsServiceEnums + @FormParam private Integer smsType; //发送频次 参见枚举 SendFrequencyEnums + @FormParam private Integer sendFrequency; //发送日期类型 参见枚举类 SendDateEnums + @FormParam private Integer sendDateType; //在选择农历或者阳历后 指定的发送日期 @@ -41,12 +49,16 @@ public class SmsTemplateRequest extends BaseQuery { private Integer end; //发送时间 参见枚举类 SendTimeEnums + @FormParam private Integer sendTimeType; //内容 + @FormParam + @NotEmpty(message = "发送内容不能为空.") private String content; //医院id + @FormParam private Integer hospitalId; //启用状态 0未启用 1启用 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index 58fc7d9..8e8362b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -1,6 +1,8 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.core.annotation.form.Form; +import com.lyms.platform.common.core.annotation.form.FormParam; +import org.hibernate.validator.constraints.NotEmpty; /** * Created by lqy on 2016/6/15. @@ -15,6 +17,8 @@ public class YunBookbuildingAddRequest { //孕妇姓名 private String pregnantName; //证件号号 + @FormParam + @NotEmpty(message = "孕妇证件号不能为空.") private String pregnantCertificateNum; //证件类型 private String pregnantCertificateTypeId; @@ -37,6 +41,8 @@ public class YunBookbuildingAddRequest { /***********孕妇联系方式***********/ //手机号码 + @FormParam + @NotEmpty(message = "孕妇手机号不能为空.") private String pregnantPhone; //工作单位 private String pregnantWorkUnit; @@ -97,18 +103,27 @@ public class YunBookbuildingAddRequest { /***********院内信息***********/ //末次月经 + @FormParam + @NotEmpty(message = "末次月经不能为空.") private String lastMenstrualPeriod; //预产期 + @FormParam + @NotEmpty(message = "预产期不能为空.") private String dueDate; //建档号 + @FormParam + @NotEmpty(message = "建档号不能为空.") private String fileCode; //建档医生 private String bookbuildingDoctor; //建档日期 + @FormParam + @NotEmpty(message = "建档日期不能为空.") private String bookbuildingDate; //服务类型 + @FormParam private Integer serviceType; //备注 @@ -117,12 +132,16 @@ public class YunBookbuildingAddRequest { //就诊卡号 + @FormParam + @NotEmpty(message = "就诊卡号不能为空.") private String vcCardNo; //医院Id + @FormParam private Integer hospitalId; //服务状态 + @FormParam private Integer serviceStatus; //体检会员 0非体验会员 1体验会员 @@ -131,6 +150,16 @@ public class YunBookbuildingAddRequest { //会员截止时间 private String vipEndTime; + //孕妇体验类型 + private Integer expType; + + public Integer getExpType() { + return expType; + } + + public void setExpType(Integer expType) { + this.expType = expType; + } public String getMremark() { return mremark;