jiangjiazhi / regional-platform

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 43 additions and 1 deletions

...	...	@@ -85,6 +85,29 @@
85	85	//建档孕周
86	86	private String createdWeek;
87	87
	88	+
	89	+ //初诊医生
	90	+ private String firstCheckDoctor;
	91	+ //初诊时间
	92	+ private String firstCheckTime;
	93	+
	94	+ public String getFirstCheckDoctor() {
	95	+ return firstCheckDoctor;
	96	+ }
	97	+
	98	+ public void setFirstCheckDoctor(String firstCheckDoctor) {
	99	+ this.firstCheckDoctor = firstCheckDoctor;
	100	+ }
	101	+
	102	+ public String getFirstCheckTime() {
	103	+ return firstCheckTime;
	104	+ }
	105	+
	106	+ public void setFirstCheckTime(String firstCheckTime) {
	107	+ this.firstCheckTime = firstCheckTime;
	108	+ }
	109	+
	110	+
88	111	public String getCreatedWeek() {
89	112	return createdWeek;
90	113	}
...	...	@@ -372,7 +395,10 @@
372	395	// 什么都不干
373	396	}
374	397	setCreatedWeek(dueWeek);
375		-
	398	+ if (destModel.getFirstCheckTime() != null)
	399	+ {
	400	+ setFirstCheckTime(DateUtil.getyyyy_MM_dd(destModel.getFirstCheckTime()));
	401	+ }
376	402	if (null != destModel.getDueStatus() && 1 == destModel.getDueStatus()) {
377	403	this.dueWeek = "终止妊娠";
378	404	} else if (3 == destModel.getType()) {

...	...	@@ -85,6 +85,22 @@
85	85	riskPatientsResult.setlName(patients.getBookbuildingDoctor());
86	86	}
87	87	}
	88	+
	89	+
	90	+ if (StringUtils.isNotEmpty(patients.getFirstCheckId())) {
	91	+ if (NumberUtils.isNumber(patients.getFirstCheckId())) {
	92	+ Users users = usersService.getUsers(NumberUtils.toInt(patients.getFirstCheckId()));
	93	+ if (users != null)
	94	+ {
	95	+ riskPatientsResult.setFirstCheckDoctor(users.getName());
	96	+ }
	97	+ }
	98	+ }
	99	+ else
	100	+ {
	101	+ riskPatientsResult.setFirstCheckDoctor("");
	102	+ }
	103	+
88	104	antExQuery.setStart(patients.getLastMenses());
89	105	antExQuery.setPid(patients.getPid());
90	106	antExQuery.setYn(YnEnums.YES.getId());