jiangjiazhi / regional-platform

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 9 additions and 4 deletions

...	...	@@ -299,7 +299,7 @@
299	299	}
300	300	}
301	301	}
302		- healthChargeFacade.addHealthCharge(hospitalId,10, model.getPatientId(), 1, 1, userId, doctorId, false);
	302	+ healthChargeFacade.addHealthCharge(hospitalId,10, model.getPatientId(), 1, 1, userId, doctorId, true);
303	303	}
304	304	}
305	305

...	...	@@ -265,10 +265,10 @@
265	265
266	266	if (model.getSource() == 1)
267	267	{
268		- Patients patients = patientsService.findOnePatientById(model.getForeignId());
269		- if (patients == null)
	268	+
	269	+ if (StringUtils.isNotEmpty(model.getBabyForeignId()))
270	270	{
271		- BabyModel babyModel = babyBookbuildingService.queryBabyBuildById(model.getForeignId());
	271	+ BabyModel babyModel = babyBookbuildingService.queryBabyBuildById(model.getBabyForeignId());
272	272	if (babyModel == null)
273	273	{
274	274	return null;
...	...	@@ -279,6 +279,11 @@
279	279	}
280	280	else
281	281	{
	282	+ Patients patients = patientsService.findOnePatientById(model.getForeignId());
	283	+ if (patients == null)
	284	+ {
	285	+ return null;
	286	+ }
282	287	map.put("userName", patients.getUsername());
283	288	map.put("age",DateUtil.getAge(patients.getBirth(), model.getCreated()));
284	289	map.put("week",patients.getType() == 3 ? "已分娩": DateUtil.getWeekDesc(patients.getLastMenses(),model.getCreated()));