jiangjiazhi / regional-platform

Authored by jiangjiazhi almost 9 years ago

Exists in master and in 8 other branches

Showing 6 changed files with 12 additions and 10 deletions

...	...	@@ -82,7 +82,7 @@
82	82	//产检医生
83	83	private String prodDoctor;
84	84	//产检日期
85		- private String checkTime;
	85	+ private Date checkTime;
86	86	//下次产检时间
87	87	private String nextCheckTime;
88	88
89	89
...	...	@@ -123,11 +123,11 @@
123	123	this.boneDensity = boneDensity;
124	124	}
125	125
126		- public String getCheckTime() {
	126	+ public Date getCheckTime() {
127	127	return checkTime;
128	128	}
129	129
130		- public void setCheckTime(String checkTime) {
	130	+ public void setCheckTime(Date checkTime) {
131	131	this.checkTime = checkTime;
132	132	}
133	133

...	...	@@ -101,7 +101,7 @@
101	101	boolean isAddStart = Boolean.FALSE;
102	102	Criteria c = null;
103	103	if (null != start) {
104		- c = Criteria.where("created").gte(start);
	104	+ c = Criteria.where("checkTime").gte(start);
105	105	isAddStart = Boolean.TRUE;
106	106	}
107	107
...	...	@@ -109,7 +109,7 @@
109	109	if (isAddStart) {
110	110	c=c.lte(end);
111	111	} else {
112		- c = Criteria.where("created").lte(end);
	112	+ c = Criteria.where("checkTime").lte(end);
113	113	}
114	114	isAddStart = Boolean.TRUE;
115	115	}

...	...	@@ -3,6 +3,7 @@
3	3	import com.lyms.platform.common.base.IBasicRequestConvert;
4	4	import com.lyms.platform.common.core.annotation.form.FormParam;
5	5	import com.lyms.platform.common.core.annotation.form.Form;
	6	+import com.lyms.platform.common.utils.DateUtil;
6	7	import com.lyms.platform.common.utils.JsonUtil;
7	8	import com.lyms.platform.pojo.PostReviewModel;
8	9	import org.hibernate.validator.constraints.NotEmpty;
...	...	@@ -339,7 +340,7 @@
339	340	postReviewModel.setTreatOpinion(treatOpinion);
340	341	postReviewModel.setDirOpinion(dirOpinion);
341	342	postReviewModel.setProdDoctor(prodDoctor);
342		- postReviewModel.setCheckTime(checkTime);
	343	+ postReviewModel.setCheckTime(DateUtil.parseYMD(checkTime));
343	344	postReviewModel.setNextCheckTime(JsonUtil.obj2JsonString(nextCheckTime));
344	345	return postReviewModel;
345	346	}

...	...	@@ -100,9 +100,9 @@
100	100
101	101	public AntData(PostReviewModel postReviewModel,String hospitalName,Date dueDate) {
102	102	this.id=postReviewModel.getId();
103		- int days = DateUtil.daysBetween(dueDate,DateUtil.parseYMD(postReviewModel.getCheckTime()));
	103	+ int days = DateUtil.daysBetween(dueDate,postReviewModel.getCheckTime());
104	104	this.dueWeek= StringUtils.dueWeek(days);
105		- this.checkTime=postReviewModel.getCheckTime();
	105	+ this.checkTime=DateUtil.getyyyy_MM_dd(postReviewModel.getCheckTime());
106	106	this.title="产后复查";
107	107	this.type="5";
108	108	this.hospitalName=hospitalName;

...	...	@@ -190,7 +190,7 @@
190	190	public AntData(PostReviewModel model, String hospitalName) {
191	191	this.id = model.getId();
192	192	this.dueWeek = model.getDay();
193		- this.checkTime = model.getCheckTime();
	193	+ this.checkTime = DateUtil.getyyyy_MM_dd(model.getCheckTime());
194	194	this.hospitalId = model.getHospitalId();
195	195	this.hospitalName = hospitalName;
196	196	}

1	1	package com.lyms.platform.operate.web.result;
2	2
	3	+import com.lyms.platform.common.utils.DateUtil;
3	4	import com.lyms.platform.common.utils.JsonUtil;
4	5	import com.lyms.platform.pojo.MaternalDeliverModel;
5	6	import com.lyms.platform.pojo.Patients;
...	...	@@ -114,7 +115,7 @@
114	115	setTreatOpinion(postReviewModel.getTreatOpinion());
115	116	setDirOpinion(postReviewModel.getDirOpinion());
116	117	setProdDoctor(postReviewModel.getProdDoctor());
117		- setCheckTime(postReviewModel.getCheckTime());
	118	+ setCheckTime(DateUtil.getyyyy_MM_dd(postReviewModel.getCheckTime()));
118	119	setNextCheckTime(JsonUtil.str2Obj(postReviewModel.getNextCheckTime(),Map.class));
119	120	return this;
120	121	}