From 02a2ccfca2be59ad806e2f0c5b9e6770a4a4243b Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 15 Feb 2017 01:24:56 +0800 Subject: [PATCH] update code --- .../com/lyms/platform/operate/web/facade/ViewFacade.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 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 b42d759..60f0db3 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 @@ -207,7 +207,7 @@ public class ViewFacade { } if (otherRisk.get("score")!=null){ String s = (String)otherRisk.get("score"); - if (FunvCommonUtil.isNumeric(s)){ + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(s) && FunvCommonUtil.isNumeric(s)){ score = score + Integer.parseInt(s); } } @@ -370,8 +370,14 @@ public class ViewFacade { map.put("planedProd", UnitUtils.unitSplice(data.getPlanedProd(),UnitConstants.CI)); //流产 String abortion = ""; - abortion = UnitUtils.unitSplice(data.getAbortion(),UnitConstants.CI) == null ? "" : (UnitUtils.unitSplice(data.getAbortion(),UnitConstants.CI) + " (自然:" + data.getAbortionZR() + UnitConstants.CI + " 人工:" + - data.getAbortionRG() + UnitConstants.CI + ")"); + abortion = UnitUtils.unitSplice(data.getAbortion(),UnitConstants.CI) == null ? "" : UnitUtils.unitSplice(data.getAbortion(),UnitConstants.CI); + if (data.getAbortionZR() != null && data.getAbortionRG() != null) + { + abortion += "(自然:" + data.getAbortionZR() + UnitConstants.CI + " 人工:" + + data.getAbortionRG() + UnitConstants.CI + ")"; + } + + map.put("abortion", abortion); /*map.put("abortion", UnitUtils.unitSplice(data.getAbortion(),UnitConstants.CI) + " (自然:" + data.getAbortionZR() + UnitConstants.CI + " 人工:" + -- 1.8.3.1