jiangjiazhi / regional-platform

Authored by yangfei over 8 years ago

1 parent 199103c7e0

Exists in master and in 6 other branches

Showing 2 changed files with 24 additions and 0 deletions

...	...	@@ -184,6 +184,7 @@
184	184
185	185	if (ac.getCheckTime().after(doctorPatient.getCheckTime())) {
186	186	doctorPatient.setCheckTime(ac.getCheckTime());
	187	+ doctorPatient.setCheckTimeStr(DateUtil.getyyyy_MM_dd(ac.getCheckTime()));
187	188	doctorPatient.setCheckDoctor(ac.getProdDoctor());
188	189	}
189	190	}
...	...	@@ -193,6 +194,7 @@
193	194	doctorPatient.setAllCjNum(doctorPatient.getAllCjNum() + 1);
194	195	if (aec.getCheckDate().after(doctorPatient.getCheckTime())) {
195	196	doctorPatient.setCheckTime(aec.getCheckDate());
	197	+ doctorPatient.setCheckTimeStr(DateUtil.getyyyy_MM_dd(aec.getCheckDate()));
196	198	doctorPatient.setCheckDoctor(aec.getCheckDoctor());
197	199	}
198	200	}
199	201
...	...	@@ -265,9 +267,11 @@
265	267	//计算孕周
266	268	adp.setcDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(DateUtil.daysBetween(patients.getLastMenses(), new Date())));
267	269	adp.setDueFmDate(patients.getDueDate());
	270	+ adp.setDueFmDateStr(DateUtil.getyyyy_MM_dd(patients.getDueDate()));
268	271	} else if (patients.getType() == 3) {//3-产妇
269	272	adp.setcDueWeek("已分娩");
270	273	adp.setDueFmDate(patients.getFmDate());
	274	+ adp.setDueFmDateStr(DateUtil.getyyyy_MM_dd(patients.getFmDate()));
271	275	}
272	276	adp.setCheckTime(ac.getCheckTime());
273	277	adp.setpName(patients.getUsername());

...	...	@@ -27,10 +27,30 @@
27	27	private String cDueWeek;
28	28	//预产期或分娩日期
29	29	private Date dueFmDate;
	30	+ //预产期或分娩日期
	31	+ private String dueFmDateStr;
30	32	//产检时间
31	33	private Date checkTime;
	34	+ //产检时间
	35	+ private String checkTimeStr;
32	36	//产检医生
33	37	private String checkDoctor;
	38	+
	39	+ public String getDueFmDateStr() {
	40	+ return dueFmDateStr;
	41	+ }
	42	+
	43	+ public void setDueFmDateStr(String dueFmDateStr) {
	44	+ this.dueFmDateStr = dueFmDateStr;
	45	+ }
	46	+
	47	+ public String getCheckTimeStr() {
	48	+ return checkTimeStr;
	49	+ }
	50	+
	51	+ public void setCheckTimeStr(String checkTimeStr) {
	52	+ this.checkTimeStr = checkTimeStr;
	53	+ }
34	54
35	55	public Date getCheckTime() {
36	56	return checkTime;