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()));