From 9e12a3a08e0b2ac63c73c2dea27c8468fe5a5633 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 27 Feb 2017 17:35:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=B5=E5=AD=90=E7=97=85?= =?UTF-8?q?=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/operate/web/facade/ViewFacade.java | 6 +++--- 1 file changed, 3 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 b42b118..a8ccd74 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 @@ -801,7 +801,7 @@ public class ViewFacade { } map.put("riskFactor", ResolveUtils.queryHighRisk(highScoreResult)); - map.put("riskScore", patients.getRiskScore() == 0 ? "" : UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN)); + map.put("riskScore", (patients.getRiskScore() ==null||patients.getRiskScore()== 0) ? "" : UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN)); map.put("deliveryDate", data.getDueDate()); map.put("dueWeek", data.getDueWeek()); @@ -1203,7 +1203,7 @@ public class ViewFacade { } map.put("riskFactor", ResolveUtils.queryHighRisk(highScoreResult)); - map.put("riskScore", patients.getRiskScore() == 0 ? "" : UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN)); + map.put("riskScore", (patients.getRiskScore()==null|| patients.getRiskScore() == 0)? "" : UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN)); /* 复查信息 */ map.put("checkTime",DateUtil.getyyyy_MM_dd(data.getCheckTime())); map.put("day",data.getDay()); @@ -1335,7 +1335,7 @@ public class ViewFacade { highScoreResult = ResolveUtils.queryRisk(patients.getRiskFactorId(),true,basicConfigService); } map.put("riskFactor",ResolveUtils.queryHighRisk(highScoreResult)); - map.put("riskScore", patients.getRiskScore() == 0 ? "" : UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN)); + map.put("riskScore", patients.getRiskScore()==null||patients.getRiskScore() == 0 ? "" : UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN)); map.put("leaveHospitalDate", DateUtil.getyyyy_MM_dd(data.getLeaveHospitalDate())); -- 1.8.3.1