From b364307e5259a2473ad2e2ab7f32f95a72351fce Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 20 Apr 2020 13:53:41 +0800 Subject: [PATCH] update --- .../com/lyms/platform/operate/web/facade/BoneFacade.java | 14 +++++++++----- .../platform/operate/web/facade/MicroelementFacade.java | 10 ++++++++-- 2 files changed, 17 insertions(+), 7 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 f70c37d..e970069 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 @@ -258,14 +258,15 @@ public class BoneFacade { } } } + if (!"0".equals(doctorId)) { + healthChargeFacade.addHealthCharge(hospitalId,8, model.getPatientId(), 1, 1, userId, doctorId, false); + } - healthChargeFacade.addHealthCharge(hospitalId,8, model.getPatientId(), 1, 1, userId, doctorId, false); } //儿童骨密度报告 - else - { + else { BabyModel babyModel = babyBookbuildingService.queryBabyBuildById(model.getPatientId()); - data.put("userName",babyModel.getName()); + data.put("userName", babyModel.getName()); data.put("age", DateUtil.getBabyMonthAge(babyModel.getBirth(), model.getCreated())); data.put("ageNum", DateUtil.getMonth(babyModel.getBirth(), model.getCreated())); data.put("sex", babyModel.getSex() == null ? "" : SexEnum.getTextById(babyModel.getSex())); @@ -296,7 +297,10 @@ public class BoneFacade { } } } - healthChargeFacade.addHealthCharge(hospitalId,10, model.getPatientId(), 1, 1, userId, doctorId, true); + if (!"0".equals(doctorId)) + { + 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/MicroelementFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java index 6b7df98..2080865 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java @@ -319,7 +319,9 @@ public class MicroelementFacade { data.put("nextCheckWeek", nextCheckWeek); data.put("contents", contents); data.put("isNormal", isNormal); - healthChargeFacade.addHealthCharge(hospitalId, 7, model.getPatientId(), 1, 1, userId, doctorId, false); + if (!"0".equals(doctorId)) { + healthChargeFacade.addHealthCharge(hospitalId, 7, model.getPatientId(), 1, 1, userId, doctorId, false); + } } //儿童微量元素报告 else @@ -371,7 +373,11 @@ public class MicroelementFacade { data.put("contents", contents); data.put("isNormal", isNormal); - healthChargeFacade.addHealthCharge(hospitalId, 9, model.getPatientId(), 1, 1, userId, doctorId, true); + if (!"0".equals(doctorId)) + { + healthChargeFacade.addHealthCharge(hospitalId, 9, model.getPatientId(), 1, 1, userId, doctorId, true); + } + } } -- 1.8.3.1