jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 753689e5c1575f507c74b9ae4d10d87c377db443

Authored by baohanddd
2 parents 438a725299 0afe772761
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 7 changed files

platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ 753689e
... ... @@ -434,11 +434,11 @@
434 434 c = Criteria.where("lastMenses").gte(dueDateStart);
435 435 isAddStart = Boolean.TRUE;
436 436 }
437   - if (null != lastMensesStart) {
  437 + if (null != lastMensesEnd) {
438 438 if (isAddStart) {
439   - c = c.lte(lastMensesStart);
  439 + c = c.lte(lastMensesEnd);
440 440 } else {
441   - c = Criteria.where("lastMenses").lte(lastMensesStart);
  441 + c = Criteria.where("lastMenses").lte(lastMensesEnd);
442 442 }
443 443 isAddStart = Boolean.TRUE;
444 444 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java View file @ 753689e
... ... @@ -46,7 +46,7 @@
46 46 */
47 47 @RequestMapping(method = RequestMethod.POST, value = "/addOrUpBabyBuild")
48 48 @ResponseBody
49   - public BaseResponse addOrUpBabyBuild(@RequestBody BabyBookbuildingAddRequest request) {
  49 + public BaseResponse addOrUpBabyBuild(@Valid @RequestBody BabyBookbuildingAddRequest request) {
50 50 if (request != null && !StringUtils.isEmpty(request.getId()))
51 51 {
52 52 return babyBookbuildingFacade.updateBabyBookbuilding(request);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java View file @ 753689e
1 1 package com.lyms.platform.operate.web.request;
2 2  
3 3 import com.lyms.platform.common.core.annotation.form.Form;
  4 +import com.lyms.platform.common.core.annotation.form.FormParam;
  5 +import org.hibernate.validator.constraints.NotEmpty;
4 6  
5 7 import java.util.List;
6 8 import java.util.Map;
... ... @@ -19,6 +21,8 @@
19 21 private String mommyName;
20 22  
21 23 //证件号号
  24 + @FormParam
  25 + @NotEmpty(message = "母亲证件号不能为空")
22 26 private String mommyCertificateNum;
23 27 //证件类型
24 28 private String mommyCertificateTypeId;
25 29  
... ... @@ -64,8 +68,12 @@
64 68 //儿童性别
65 69 private Integer sex;
66 70 //儿童身份证
  71 + @FormParam
  72 + @NotEmpty(message = "儿童身份证号不能为空")
67 73 private String babyCardNo;
68 74 //儿童生日
  75 + @FormParam
  76 + @NotEmpty(message = "儿童生日不能为空")
69 77 private String babyBirthday;
70 78 //家庭住址
71 79 private String homeAddress;
... ... @@ -78,6 +86,8 @@
78 86 /***********儿童出生信息***********/
79 87  
80 88 //预产期
  89 + @FormParam
  90 + @NotEmpty(message = "预产期不能为空")
81 91 private String dueDate;
82 92 //分娩方式
83 93 private String dueType;
... ... @@ -106,6 +116,8 @@
106 116 private String buildDoctor;
107 117  
108 118 //建档日期
  119 + @FormParam
  120 + @NotEmpty(message = "建档日期不能为空")
109 121 private String buildDate;
110 122  
111 123 //服务类型
112 124  
... ... @@ -115,8 +127,11 @@
115 127 private Integer serviceStatus;
116 128  
117 129 //就诊卡号
  130 + @FormParam
  131 + @NotEmpty(message = "就诊卡号不能为空")
118 132 private String vcCardNo;
119 133  
  134 + @FormParam
120 135 private Integer hospitalId;
121 136  
122 137 //体验会员 0非体验会员 1体验会员
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java View file @ 753689e
1 1 package com.lyms.platform.operate.web.request;
2 2  
  3 +import com.lyms.platform.common.core.annotation.form.FormParam;
  4 +import org.hibernate.validator.constraints.NotEmpty;
  5 +
3 6 import java.util.Map;
4 7  
5 8 /**
... ... @@ -12,6 +15,8 @@
12 15 private String id;
13 16  
14 17 //建档ID
  18 + @FormParam
  19 + @NotEmpty(message = "建档ID不能为空.")
15 20 private String buildId;
16 21  
17 22 /******问诊情况****/
... ... @@ -195,6 +200,8 @@
195 200 private String checkDoctor;
196 201  
197 202 //下次预约
  203 + @FormParam
  204 + @NotEmpty(message = "下次预约时间不能为空.")
198 205 private String nextDate;
199 206  
200 207 //是否高危儿童 0 非高危 1高危
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsConfigRequest.java View file @ 753689e
1 1 package com.lyms.platform.operate.web.request;
2 2  
  3 +import com.lyms.platform.common.core.annotation.form.FormParam;
  4 +import org.hibernate.validator.constraints.NotEmpty;
  5 +
3 6 import java.util.List;
4 7 import java.util.Map;
5 8  
6 9  
7 10  
... ... @@ -11,15 +14,20 @@
11 14 private String id;
12 15  
13 16 //前缀类型 0医院前缀 1科室前缀
  17 + @FormParam
14 18 private Integer prefixType;
15 19  
16 20 //医院前缀
  21 + @FormParam
  22 + @NotEmpty(message = "医院前缀不能为空.")
17 23 private String hospitalPrefix;
18 24  
19 25 //科室前缀
20 26 private List<Map<String,String>> deptPrefix;
21 27  
22 28 //指导发送时间
  29 + @FormParam
  30 + @NotEmpty(message = "指导发送时间不能为空.")
23 31 private String guideTime;
24 32  
25 33 //消息服务启动
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsTemplateRequest.java View file @ 753689e
1 1 package com.lyms.platform.operate.web.request;
2 2  
3 3  
  4 +import com.lyms.platform.common.core.annotation.form.FormParam;
4 5 import com.lyms.platform.common.dao.BaseQuery;
  6 +import org.hibernate.validator.constraints.NotEmpty;
5 7  
6 8  
7 9 /**
8 10  
9 11  
10 12  
11 13  
12 14  
... ... @@ -13,21 +15,27 @@
13 15  
14 16  
15 17 //发送对象 枚举定义参考 ServiceObjEnums
  18 + @FormParam
16 19 private Integer serviceObj;
17 20  
18 21 //服务类型 参见枚举 ServiceTypeEnums
  22 + @FormParam
19 23 private Integer serviceType;
20 24  
21 25 //服务状态 参见枚举ServiceStatusEnums
  26 + @FormParam
22 27 private Integer serviceStatus;
23 28  
24 29 //消息类型 参见枚举 SmsServiceEnums
  30 + @FormParam
25 31 private Integer smsType;
26 32  
27 33 //发送频次 参见枚举 SendFrequencyEnums
  34 + @FormParam
28 35 private Integer sendFrequency;
29 36  
30 37 //发送日期类型 参见枚举类 SendDateEnums
  38 + @FormParam
31 39 private Integer sendDateType;
32 40  
33 41 //在选择农历或者阳历后 指定的发送日期
34 42  
35 43  
... ... @@ -41,12 +49,16 @@
41 49 private Integer end;
42 50  
43 51 //发送时间 参见枚举类 SendTimeEnums
  52 + @FormParam
44 53 private Integer sendTimeType;
45 54  
46 55 //内容
  56 + @FormParam
  57 + @NotEmpty(message = "发送内容不能为空.")
47 58 private String content;
48 59  
49 60 //医院id
  61 + @FormParam
50 62 private Integer hospitalId;
51 63  
52 64 //启用状态 0未启用 1启用
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java View file @ 753689e
1 1 package com.lyms.platform.operate.web.request;
2 2  
3 3 import com.lyms.platform.common.core.annotation.form.Form;
  4 +import com.lyms.platform.common.core.annotation.form.FormParam;
  5 +import org.hibernate.validator.constraints.NotEmpty;
4 6  
5 7 /**
6 8 * Created by lqy on 2016/6/15.
... ... @@ -15,6 +17,8 @@
15 17 //孕妇姓名
16 18 private String pregnantName;
17 19 //证件号号
  20 + @FormParam
  21 + @NotEmpty(message = "孕妇证件号不能为空.")
18 22 private String pregnantCertificateNum;
19 23 //证件类型
20 24 private String pregnantCertificateTypeId;
... ... @@ -37,6 +41,8 @@
37 41  
38 42 /***********孕妇联系方式***********/
39 43 //手机号码
  44 + @FormParam
  45 + @NotEmpty(message = "孕妇手机号不能为空.")
40 46 private String pregnantPhone;
41 47 //工作单位
42 48 private String pregnantWorkUnit;
43 49  
44 50  
45 51  
46 52  
... ... @@ -97,18 +103,27 @@
97 103  
98 104 /***********院内信息***********/
99 105 //末次月经
  106 + @FormParam
  107 + @NotEmpty(message = "末次月经不能为空.")
100 108 private String lastMenstrualPeriod;
101 109 //预产期
  110 + @FormParam
  111 + @NotEmpty(message = "预产期不能为空.")
102 112 private String dueDate;
103 113  
104 114 //建档号
  115 + @FormParam
  116 + @NotEmpty(message = "建档号不能为空.")
105 117 private String fileCode;
106 118 //建档医生
107 119 private String bookbuildingDoctor;
108 120  
109 121 //建档日期
  122 + @FormParam
  123 + @NotEmpty(message = "建档日期不能为空.")
110 124 private String bookbuildingDate;
111 125 //服务类型
  126 + @FormParam
112 127 private Integer serviceType;
113 128  
114 129 //备注
115 130  
116 131  
... ... @@ -117,12 +132,16 @@
117 132  
118 133  
119 134 //就诊卡号
  135 + @FormParam
  136 + @NotEmpty(message = "就诊卡号不能为空.")
120 137 private String vcCardNo;
121 138  
122 139 //医院Id
  140 + @FormParam
123 141 private Integer hospitalId;
124 142  
125 143 //服务状态
  144 + @FormParam
126 145 private Integer serviceStatus;
127 146  
128 147 //体检会员 0非体验会员 1体验会员
... ... @@ -131,6 +150,16 @@
131 150 //会员截止时间
132 151 private String vipEndTime;
133 152  
  153 + //孕妇体验类型
  154 + private Integer expType;
  155 +
  156 + public Integer getExpType() {
  157 + return expType;
  158 + }
  159 +
  160 + public void setExpType(Integer expType) {
  161 + this.expType = expType;
  162 + }
134 163  
135 164 public String getMremark() {
136 165 return mremark;