From 9a789cc1008e7ea94196b808c323a059ca6f0d69 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 23 Mar 2018 16:52:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=AB=E9=AB=98=E6=9F=A5=E8=AF=A2=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/facade/ViewFacade.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) 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 e65bf7e..40effd2 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 @@ -1993,7 +1993,22 @@ public class ViewFacade { szy = chBpMap.get("szy"); } map.put("bp", UnitUtils.unitSplice(ssy + "/" + szy, UnitConstants.MMHG)); - map.put("gongGao", StringUtils.isNumeric(data.getGongGao()) ? UnitUtils.unitSplice(data.getGongGao(), UnitConstants.CM) : data.getGongGao() == null ? "" : data.getGongGao()); + + String gongGao = ""; + if (StringUtils.isNotEmpty(data.getGongGaoSelect()) ) + { + if (StringUtils.isNotEmpty(data.getGongGaoType())) { + gongGao = GongJingEnums.getGongGaoNameById(data.getGongGaoSelect()) + "，" + GongJingEnums.getHengZhiNameById(data.getGongGaoType()); + } else { + gongGao = GongJingEnums.getGongGaoNameById(data.getGongGaoSelect()); + } + } + else if (StringUtils.isNotEmpty(data.getGongGao())) + { + gongGao = UnitUtils.unitSplice(data.getGongGao(), UnitConstants.CM); + } + + map.put("gongGao", gongGao); if (StringUtils.isNotEmpty(data.getGongGaoSelect())) { map.put("gongGaoSelect", GongJingEnums.getGongGaoNameById(data.getGongGaoSelect())); -- 1.8.3.1