jiangjiazhi / regional-platform

Authored by jiangjiazhi over 9 years ago

Exists in master and in 8 other branches

Showing 2 changed files with 4 additions and 3 deletions

...	...	@@ -445,7 +445,7 @@
445	445	if (null != an.getHospitalId()) {
446	446	organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
447	447	}
448		- data.add(new AntData(an, null != organization ? organization.getName() : ""));
	448	+ data.add(new AntData(an, null != organization ? organization.getName() : "",patients.getLastMenses()));
449	449	}
450	450	}
451	451
452	452
...	...	@@ -660,10 +660,11 @@
660	660	Organization organization = null;
661	661	if (CollectionUtils.isNotEmpty(antExChulist)) {
662	662	for (AntExChuModel antExChuModel1 : antExChulist) {
	663	+ Patients patients =patientsService.findOnePatientById(antExChuModel1.getParentId());
663	664	if (null != antExChuModel1.getHospitalId()) {
664	665	organization = organizationService.getOrganization(Integer.valueOf(antExChuModel1.getHospitalId()));
665	666	}
666		- dataList.add(new AntData(antExChuModel1, null != organization ? organization.getName() : ""));
	667	+ dataList.add(new AntData(antExChuModel1, null != organization ? organization.getName() : "",patients.getLastMenses()));
667	668	}
668	669	}
669	670	if (CollectionUtils.isNotEmpty(list)) {

...	...	@@ -62,7 +62,7 @@
62	62	this.hospitalId=model.getHospitalId();
63	63	}
64	64
65		- public AntData(AntExChuModel model,String hospitalName) {
	65	+ public AntData(AntExChuModel model,String hospitalName,Date lastMenses) {
66	66	this.id = model.getId();
67	67	int days = DateUtil.daysBetween(model.getLastMenses(), model.getCheckTime());
68	68	this.dueWeek = StringUtils.dueWeek(days);