Commit 9a789cc1008e7ea94196b808c323a059ca6f0d69
1 parent
5b2d8a0015
Exists in
master
and in
6 other branches
宫高查询看
Showing 1 changed file with 16 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
9a789cc
| ... | ... | @@ -1993,7 +1993,22 @@ |
| 1993 | 1993 | szy = chBpMap.get("szy"); |
| 1994 | 1994 | } |
| 1995 | 1995 | map.put("bp", UnitUtils.unitSplice(ssy + "/" + szy, UnitConstants.MMHG)); |
| 1996 | - map.put("gongGao", StringUtils.isNumeric(data.getGongGao()) ? UnitUtils.unitSplice(data.getGongGao(), UnitConstants.CM) : data.getGongGao() == null ? "" : data.getGongGao()); | |
| 1996 | + | |
| 1997 | + String gongGao = ""; | |
| 1998 | + if (StringUtils.isNotEmpty(data.getGongGaoSelect()) ) | |
| 1999 | + { | |
| 2000 | + if (StringUtils.isNotEmpty(data.getGongGaoType())) { | |
| 2001 | + gongGao = GongJingEnums.getGongGaoNameById(data.getGongGaoSelect()) + "，" + GongJingEnums.getHengZhiNameById(data.getGongGaoType()); | |
| 2002 | + } else { | |
| 2003 | + gongGao = GongJingEnums.getGongGaoNameById(data.getGongGaoSelect()); | |
| 2004 | + } | |
| 2005 | + } | |
| 2006 | + else if (StringUtils.isNotEmpty(data.getGongGao())) | |
| 2007 | + { | |
| 2008 | + gongGao = UnitUtils.unitSplice(data.getGongGao(), UnitConstants.CM); | |
| 2009 | + } | |
| 2010 | + | |
| 2011 | + map.put("gongGao", gongGao); | |
| 1997 | 2012 | |
| 1998 | 2013 | if (StringUtils.isNotEmpty(data.getGongGaoSelect())) { |
| 1999 | 2014 | map.put("gongGaoSelect", GongJingEnums.getGongGaoNameById(data.getGongGaoSelect())); |