From 4a66bea1eb4daf9b3ae5061e0a1c6cf07026ab8b Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sat, 11 Apr 2020 10:21:55 +0800 Subject: [PATCH] update --- .../java/com/lyms/platform/operate/web/facade/BoneFacade.java | 2 +- .../lyms/platform/operate/web/facade/HealthChargeFacade.java | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java index 825a9d2..90bfafa 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java @@ -299,7 +299,7 @@ public class BoneFacade { } } } - healthChargeFacade.addHealthCharge(hospitalId,10, model.getPatientId(), 1, 1, userId, doctorId, false); + healthChargeFacade.addHealthCharge(hospitalId,10, model.getPatientId(), 1, 1, userId, doctorId, true); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java index 1c9a808..c7b3045 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java @@ -265,10 +265,10 @@ public class HealthChargeFacade { if (model.getSource() == 1) { - Patients patients = patientsService.findOnePatientById(model.getForeignId()); - if (patients == null) + + if (StringUtils.isNotEmpty(model.getBabyForeignId())) { - BabyModel babyModel = babyBookbuildingService.queryBabyBuildById(model.getForeignId()); + BabyModel babyModel = babyBookbuildingService.queryBabyBuildById(model.getBabyForeignId()); if (babyModel == null) { return null; @@ -279,6 +279,11 @@ public class HealthChargeFacade { } else { + Patients patients = patientsService.findOnePatientById(model.getForeignId()); + if (patients == null) + { + return null; + } map.put("userName", patients.getUsername()); map.put("age",DateUtil.getAge(patients.getBirth(), model.getCreated())); map.put("week",patients.getType() == 3 ? "已分娩": DateUtil.getWeekDesc(patients.getLastMenses(),model.getCreated())); -- 1.8.3.1