From a70c0cb3880c604d01baeba5a775e26d50e92255 Mon Sep 17 00:00:00 2001 From: yangfei Date: Mon, 14 May 2018 17:53:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=94=9F=E5=84=BF=E8=AF=84=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/operate/web/facade/ViewFacade.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 704777b..0a3fc50 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -1783,7 +1783,7 @@ public class ViewFacade { java.text.DecimalFormat df = new java.text.DecimalFormat("#.#"); df.setRoundingMode(RoundingMode.FLOOR); double tzzs = Double.parseDouble(data.getYqWeight()) / Math.pow(Double.parseDouble(data.getHeight()) / 100, 2); - System.out.println("tzzs==================" + tzzs+""); + System.out.println("tzzs==================" + tzzs); map.put("tzzs", df.format(tzzs)); } catch (Exception e) { ExceptionUtils.catchException(e, "体重指数计算错误"); @@ -2573,6 +2573,7 @@ public class ViewFacade { babyMap.put("babyWeight", UnitUtils.unitSplice(temp.getBabyWeight(), UnitConstants.G)); babyMap.put("babyHeight", UnitUtils.unitSplice(temp.getBabyHeight(), UnitConstants.CM)); babyMap.put("babyHealthy", temp.getBabyHealthy()); + babyMap.put("apgarScoreMap", temp.getApgarScore()); String apgarScorePf1 = ""; String apgarScorePf5 = ""; String apgarScorePf10 = ""; @@ -2584,7 +2585,7 @@ public class ViewFacade { } String apgarScore = ""; - if (StringUtils.isNotEmpty(apgarScorePf1) && StringUtils.isNotEmpty(apgarScorePf5) && StringUtils.isNotEmpty(apgarScorePf10)) { + if (StringUtils.isNotEmpty(apgarScorePf1) || StringUtils.isNotEmpty(apgarScorePf5) || StringUtils.isNotEmpty(apgarScorePf10)) { apgarScore = apgarScorePf1 + UnitConstants.FEN + " - " + apgarScorePf5 + UnitConstants.FEN + " - " + apgarScorePf10 + UnitConstants.FEN; } babyMap.put("apgarScore", apgarScore); -- 1.8.3.1