Commit 02a2ccfca2be59ad806e2f0c5b9e6770a4a4243b
1 parent
2affc775d9
Exists in
master
and in
6 other branches
update code
Showing 1 changed file with 9 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
02a2ccf
| ... | ... | @@ -207,7 +207,7 @@ |
| 207 | 207 | } |
| 208 | 208 | if (otherRisk.get("score")!=null){ |
| 209 | 209 | String s = (String)otherRisk.get("score"); |
| 210 | - if (FunvCommonUtil.isNumeric(s)){ | |
| 210 | + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(s) && FunvCommonUtil.isNumeric(s)){ | |
| 211 | 211 | score = score + Integer.parseInt(s); |
| 212 | 212 | } |
| 213 | 213 | } |
| ... | ... | @@ -370,8 +370,14 @@ |
| 370 | 370 | map.put("planedProd", UnitUtils.unitSplice(data.getPlanedProd(),UnitConstants.CI)); |
| 371 | 371 | //流产 |
| 372 | 372 | String abortion = ""; |
| 373 | - abortion = UnitUtils.unitSplice(data.getAbortion(),UnitConstants.CI) == null ? "" : (UnitUtils.unitSplice(data.getAbortion(),UnitConstants.CI) + " (自然:" + data.getAbortionZR() + UnitConstants.CI + " 人工:" + | |
| 374 | - data.getAbortionRG() + UnitConstants.CI + ")"); | |
| 373 | + abortion = UnitUtils.unitSplice(data.getAbortion(),UnitConstants.CI) == null ? "" : UnitUtils.unitSplice(data.getAbortion(),UnitConstants.CI); | |
| 374 | + if (data.getAbortionZR() != null && data.getAbortionRG() != null) | |
| 375 | + { | |
| 376 | + abortion += "(自然:" + data.getAbortionZR() + UnitConstants.CI + " 人工:" + | |
| 377 | + data.getAbortionRG() + UnitConstants.CI + ")"; | |
| 378 | + } | |
| 379 | + | |
| 380 | + | |
| 375 | 381 | map.put("abortion", abortion); |
| 376 | 382 | |
| 377 | 383 | /*map.put("abortion", UnitUtils.unitSplice(data.getAbortion(),UnitConstants.CI) + " (自然:" + data.getAbortionZR() + UnitConstants.CI + " 人工:" + |