shiyang / regional-platform

Authored by liquanyu over 9 years ago

Showing 3 changed files with 22 additions and 2 deletions

...	...	@@ -232,7 +232,12 @@
232	232	for (BabyCheckModel cmodel : checkModels) {
233	233	Map<String, String> checkRecord = new HashMap<>();
234	234	Date checkDate = cmodel.getCheckDate();
235		- String monthAge = DateUtil.getBabyMonthAge(babyBirth, checkDate);
	235	+ String monthAge = "";
	236	+ if(babyBirth == null \|\| checkDate == null)
	237	+ {
	238	+ monthAge = DateUtil.getBabyMonthAge(babyBirth, checkDate);
	239	+ }
	240	+
236	241	checkRecord.put("id", cmodel.getId());
237	242	checkRecord.put("checkDate", DateUtil.getyyyy_MM_dd(checkDate));
238	243	checkRecord.put("monthAge", monthAge);

...	...	@@ -18,6 +18,8 @@
18	18	private String id;
19	19
20	20	//母亲名称
	21	+ @FormParam
	22	+ @NotEmpty(message = "母亲名称不能为空")
21	23	private String mommyName;
22	24
23	25	//证件号号
...	...	@@ -25,6 +27,8 @@
25	27	@NotEmpty(message = "母亲证件号不能为空")
26	28	private String mommyCertificateNum;
27	29	//证件类型
	30	+ @FormParam
	31	+ @NotEmpty(message = "母亲证件类型不能为空")
28	32	private String mommyCertificateTypeId;
29	33
30	34	//母亲生日
...	...	@@ -37,6 +41,8 @@
37	41	private String mommyProfessionTypeId;
38	42
39	43	//母亲联系方式
	44	+ @FormParam
	45	+ @NotEmpty(message = "母亲联系方式不能为空")
40	46	private String mommyPhone;
41	47
42	48	//母亲备注
...	...	@@ -63,6 +69,8 @@
63	69	/*********儿童信息*********/
64	70
65	71	//儿童名称
	72	+ @FormParam
	73	+ @NotEmpty(message = "母亲儿童名称不能为空")
66	74	private String babyName;
67	75
68	76	//儿童性别
...	...	@@ -109,6 +117,8 @@
109	117
110	118
111	119	//建档医生
	120	+ @FormParam
	121	+ @NotEmpty(message = "建档医生不能为空")
112	122	private String buildDoctor;
113	123
114	124	//建档日期
...	...	@@ -126,6 +136,7 @@
126	136	private String vcCardNo;
127	137
128	138	@FormParam
	139	+ @NotEmpty(message = "医院ID不能为空")
129	140	private String hospitalId;
130	141
131	142	//体验会员 0非体验会员 1体验会员

...	...	@@ -206,6 +206,8 @@
206	206	private String guideSuggest;
207	207
208	208	//产检医生
	209	+ @FormParam
	210	+ @NotEmpty(message = "检查医生不能为空")
209	211	private String checkDoctor;
210	212
211	213	//下次预约
...	...	@@ -213,7 +215,9 @@
213	215
214	216	//是否高危儿童 0 非高危 1高危
215	217	private Integer highRisk;
216		-
	218	+ //建档ID
	219	+ @FormParam
	220	+ @NotEmpty(message = "检查日期不能为空")
217	221	private String checkDate;
218	222
219	223	private String monthAge;