From ead3b6701165fcd3694067577f6fcf0e2d5b4037 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 26 Mar 2021 18:25:45 +0800 Subject: [PATCH] update --- .../operate/web/facade/BabyHighRiskBabyFacade.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java index cdf20e2..e0dde71 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java @@ -795,9 +795,7 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { } data.put("referraHospital",referraHospital); data.put("jwbqk",babyHighRiskBabyModel.getJwbqk()); - BabyHighRiskBabyModel riskBabyModel1 = checkModels.get(0); - data.put("zgStatus",riskBabyModel1.getZgStatus()); - data.put("closeDate",DateUtil.getyyyy_MM_dd(riskBabyModel1.getcCDate())); + String diagnoseValue = getHighRiskDiagnoseStr(babyHighRiskBabyModel)+(babyHighRiskBabyModel.getHighRiskQt() == null ? "" : " "+ babyHighRiskBabyModel.getHighRiskQt()); data.put("diagnoseValue",diagnoseValue); } @@ -812,10 +810,13 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { fzData.put("handleOther", babyHighRiskBabyModel.getHandleOther()); StringBuffer exection = new StringBuffer(); - handleExecption(babyHighRiskBabyModel.getSkin(),exection); - handleExecption(babyHighRiskBabyModel.getWg(),exection); + handleExecption(babyHighRiskBabyModel.getMs(), exection); + handleExecption(babyHighRiskBabyModel.getPf(), exection); + handleExecption(babyHighRiskBabyModel.getXf(), exection); +// handleExecption(babyHighRiskBabyModel.getSkin(), exection); + handleExecption(babyHighRiskBabyModel.getWg(), exection); handleExecption(babyHighRiskBabyModel.getTooth(),exection); - handleExecption(babyHighRiskBabyModel.getHeart(),exection); +// handleExecption(babyHighRiskBabyModel.getHeart(),exection); handleExecption(babyHighRiskBabyModel.getLung(), exection); handleExecption(babyHighRiskBabyModel.getAbdomen(), exection); handleExecption(babyHighRiskBabyModel.getWszq(), exection); @@ -828,7 +829,8 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { fzData.put("checkDate", DateUtil.getyyyy_MM_dd(babyHighRiskBabyModel.getCheckDate())); fzData.put("age", DateUtil.getBabyMonthAge(babyHighRiskBabyModel.getBirthday(), babyHighRiskBabyModel.getCheckDate())); fzData.put("checkDoctor", usersService.getUsers(Integer.parseInt(babyHighRiskBabyModel.getCheckDoctor())).getName()); - + data.put("zgStatus",babyHighRiskBabyModel.getZgStatus()); + data.put("closeDate",DateUtil.getyyyy_MM_dd(babyHighRiskBabyModel.getcCDate())); fzDatas.add(fzData); } } -- 1.8.3.1