jiangjiazhi / regional-platform

Authored by jiangjiazhi about 9 years ago

Exists in master and in 8 other branches

Showing 2 changed files with 13 additions and 1 deletions

...	...	@@ -230,7 +230,7 @@
230	230	if (brith.getTime() >= tempDate.getTime()) {
231	231	//设置孕妇分娩日期
232	232	Patients patientUpdate = new Patients();
233		- patientUpdate.setYn(YnEnums.YES.getId());
	233	+ patientUpdate.setId(pat.getId());
234	234	patientUpdate.setFmDate(StringUtils.isEmpty(request.getDueDate()) ? DateUtil.parseYMD(request.getBabyBirthday()) : DateUtil.parseYMD(request.getDueDate()));
235	235	patientsService.updatePatient(patientUpdate);
236	236	}

...	...	@@ -152,6 +152,12 @@
152	152	userName = patients1.getUsername();
153	153	if (null != deliverAddRequest.getDueDate()) {
154	154	Date fmDate = DateUtil.parseYMD(deliverAddRequest.getDueDate());
	155	+
	156	+ Patients patientsLocal = new Patients();
	157	+ patientsLocal.setId(deliverAddRequest.getParentId());
	158	+ patientsLocal.setFmDate(fmDate);
	159	+ patientsService.updatePatient(patientsLocal);
	160	+
155	161	//修改分娩日期
156	162	updatePatientFmDate(patients1.getPid(), fmDate, 1);
157	163	//修改person表状态为产妇
...	...	@@ -240,6 +246,12 @@
240	246	PatientsQuery patientsQuery = new PatientsQuery();
241	247	patientsQuery.setId(deliverAddRequest.getParentId());
242	248	Patients patients = patientsService.findOnePatientById(deliverAddRequest.getParentId());
	249	+
	250	+ Patients patients1 = new Patients();
	251	+ patients1.setId(deliverAddRequest.getParentId());
	252	+ patients1.setFmDate(fmDate);
	253	+ patientsService.updatePatient(patients1);
	254	+
243	255	//修改分娩日期
244	256	updatePatientFmDate(patients.getPid(), fmDate, 3);
245	257	/* if (CollectionUtils.isNotEmpty(patients)) {