Commit 9e12a3a08e0b2ac63c73c2dea27c8468fe5a5633
1 parent
dfdedc8f30
Exists in
master
and in
6 other branches
修改电子病历
Showing 1 changed file with 3 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
9e12a3a
| ... | ... | @@ -801,7 +801,7 @@ |
| 801 | 801 | } |
| 802 | 802 | |
| 803 | 803 | map.put("riskFactor", ResolveUtils.queryHighRisk(highScoreResult)); |
| 804 | - map.put("riskScore", patients.getRiskScore() == 0 ? "" : UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN)); | |
| 804 | + map.put("riskScore", (patients.getRiskScore() ==null||patients.getRiskScore()== 0) ? "" : UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN)); | |
| 805 | 805 | |
| 806 | 806 | map.put("deliveryDate", data.getDueDate()); |
| 807 | 807 | map.put("dueWeek", data.getDueWeek()); |
| ... | ... | @@ -1203,7 +1203,7 @@ |
| 1203 | 1203 | } |
| 1204 | 1204 | |
| 1205 | 1205 | map.put("riskFactor", ResolveUtils.queryHighRisk(highScoreResult)); |
| 1206 | - map.put("riskScore", patients.getRiskScore() == 0 ? "" : UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN)); | |
| 1206 | + map.put("riskScore", (patients.getRiskScore()==null|| patients.getRiskScore() == 0)? "" : UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN)); | |
| 1207 | 1207 | /* 复查信息 */ |
| 1208 | 1208 | map.put("checkTime",DateUtil.getyyyy_MM_dd(data.getCheckTime())); |
| 1209 | 1209 | map.put("day",data.getDay()); |
| ... | ... | @@ -1335,7 +1335,7 @@ |
| 1335 | 1335 | highScoreResult = ResolveUtils.queryRisk(patients.getRiskFactorId(),true,basicConfigService); |
| 1336 | 1336 | } |
| 1337 | 1337 | map.put("riskFactor",ResolveUtils.queryHighRisk(highScoreResult)); |
| 1338 | - map.put("riskScore", patients.getRiskScore() == 0 ? "" : UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN)); | |
| 1338 | + map.put("riskScore", patients.getRiskScore()==null||patients.getRiskScore() == 0 ? "" : UnitUtils.unitSplice(patients.getRiskScore(),UnitConstants.FEN)); | |
| 1339 | 1339 | |
| 1340 | 1340 | map.put("leaveHospitalDate", DateUtil.getyyyy_MM_dd(data.getLeaveHospitalDate())); |
| 1341 | 1341 |