jiangjiazhi / regional-platform

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

Showing 1 changed file with 9 additions and 5 deletions

...	...	@@ -234,10 +234,12 @@
234	234	patientsQuery.setHospitalId(hospitalId);
235	235	patientsQuery.setYn(YnEnums.YES.getId());
236	236	patientsQuery.setId(parentId);
	237	+ patientsQuery.setLastMensesStart(DateUtil.addDay(new Date(),-280));
237	238	patientsQuery.setSort(" created ");
238	239	List<Patients> patients = patientsService.queryPatient(patientsQuery);
239	240	if (CollectionUtils.isEmpty(patients))
240	241	{
	242	+ patientsQuery.setHospitalId(null);
241	243	patientsQuery.setYn(YnEnums.YES.getId());
242	244	patientsQuery.setId(null);
243	245	patientsQuery.setPid(deliverAddRequest.getPid());
244	246
245	247
246	248
...	...	@@ -246,21 +248,23 @@
246	248	if (CollectionUtils.isNotEmpty(patientsss))
247	249	{
248	250	Patients pat = patientsss.get(0);
249		- String source = pat.getId();
	251	+ String source = pat.getSource() == null ? pat.getId() : pat.getSource();
250	252	pat.setId(null);
251	253	pat.setEnable("2");
252	254	pat.setHospitalId(maternalDeliverModel.getFmHospital());
253	255	pat.setSource(source);
254	256
255		- patientsService.addPatient(pat);
	257	+ pat = patientsService.addPatient(pat);
256	258	maternalDeliverModel.setParentId(pat.getId());
257	259	deliverAddRequest.setParentId(pat.getId());
258	260	}
259	261	}
260		-
	262	+ else
	263	+ {
	264	+ maternalDeliverModel.setParentId(parentId);
	265	+ deliverAddRequest.setParentId(parentId);
	266	+ }
261	267	}
262		- maternalDeliverModel.setParentId(parentId);
263		- deliverAddRequest.setParentId(parentId);
264	268	}
265	269	}
266	270	Patients patients2 = patientsService.findOnePatientById(deliverAddRequest.getParentId());