jiangjiazhi / regional-platform

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 17 additions and 7 deletions

...	...	@@ -258,14 +258,15 @@
258	258	}
259	259	}
260	260	}
	261	+ if (!"0".equals(doctorId)) {
	262	+ healthChargeFacade.addHealthCharge(hospitalId,8, model.getPatientId(), 1, 1, userId, doctorId, false);
	263	+ }
261	264
262		- healthChargeFacade.addHealthCharge(hospitalId,8, model.getPatientId(), 1, 1, userId, doctorId, false);
263	265	}
264	266	//儿童骨密度报告
265		- else
266		- {
	267	+ else {
267	268	BabyModel babyModel = babyBookbuildingService.queryBabyBuildById(model.getPatientId());
268		- data.put("userName",babyModel.getName());
	269	+ data.put("userName", babyModel.getName());
269	270	data.put("age", DateUtil.getBabyMonthAge(babyModel.getBirth(), model.getCreated()));
270	271	data.put("ageNum", DateUtil.getMonth(babyModel.getBirth(), model.getCreated()));
271	272	data.put("sex", babyModel.getSex() == null ? "" : SexEnum.getTextById(babyModel.getSex()));
...	...	@@ -296,7 +297,10 @@
296	297	}
297	298	}
298	299	}
299		- healthChargeFacade.addHealthCharge(hospitalId,10, model.getPatientId(), 1, 1, userId, doctorId, true);
	300	+ if (!"0".equals(doctorId))
	301	+ {
	302	+ healthChargeFacade.addHealthCharge(hospitalId,10, model.getPatientId(), 1, 1, userId, doctorId, true);
	303	+ }
300	304	}
301	305	}
302	306

...	...	@@ -319,7 +319,9 @@
319	319	data.put("nextCheckWeek", nextCheckWeek);
320	320	data.put("contents", contents);
321	321	data.put("isNormal", isNormal);
322		- healthChargeFacade.addHealthCharge(hospitalId, 7, model.getPatientId(), 1, 1, userId, doctorId, false);
	322	+ if (!"0".equals(doctorId)) {
	323	+ healthChargeFacade.addHealthCharge(hospitalId, 7, model.getPatientId(), 1, 1, userId, doctorId, false);
	324	+ }
323	325	}
324	326	//儿童微量元素报告
325	327	else
...	...	@@ -371,7 +373,11 @@
371	373
372	374	data.put("contents", contents);
373	375	data.put("isNormal", isNormal);
374		- healthChargeFacade.addHealthCharge(hospitalId, 9, model.getPatientId(), 1, 1, userId, doctorId, true);
	376	+ if (!"0".equals(doctorId))
	377	+ {
	378	+ healthChargeFacade.addHealthCharge(hospitalId, 9, model.getPatientId(), 1, 1, userId, doctorId, true);
	379	+ }
	380	+
375	381	}
376	382
377	383	}