Commit 98cc32f2bc0c53fee16c35690543afa2f454a209
1 parent
17d94abe3d
Exists in
master
and in
6 other branches
1
Showing 2 changed files with 12 additions and 0 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
View file @
98cc32f
| ... | ... | @@ -415,6 +415,13 @@ |
| 415 | 415 | result.setDueDate(DateUtil.getyyyy_MM_dd(patients.getDueDate())); |
| 416 | 416 | //高危因素 |
| 417 | 417 | result.setRiskFactor(commonService.resloveFactor(patients.getRiskFactorId())); |
| 418 | + | |
| 419 | + if (!"-".equals(result.getRiskFactor()) && org.apache.commons.lang.StringUtils.isNotEmpty(patients.getoRiskFactor())) { | |
| 420 | + result.setRiskFactor(result.getRiskFactor() + "," + patients.getoRiskFactor()); | |
| 421 | + }else if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getoRiskFactor())) | |
| 422 | + { | |
| 423 | + result.setRiskFactor(patients.getoRiskFactor()); | |
| 424 | + } | |
| 418 | 425 | //高危等级颜色 |
| 419 | 426 | result.setrLevel(commonService.findRiskLevel(patients.getRiskLevelId())); |
| 420 | 427 | }else{ |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java
View file @
98cc32f
| 1 | 1 | package com.lyms.platform.operate.web.result; |
| 2 | 2 | |
| 3 | +import com.lyms.platform.common.utils.StringUtils; | |
| 4 | + | |
| 3 | 5 | import java.util.List; |
| 4 | 6 | import java.util.Map; |
| 5 | 7 | |
| ... | ... | @@ -184,6 +186,9 @@ |
| 184 | 186 | } |
| 185 | 187 | |
| 186 | 188 | public String getRiskFactor() { |
| 189 | + if(StringUtils.isEmpty(riskFactor)){ | |
| 190 | + return "-"; | |
| 191 | + } | |
| 187 | 192 | return riskFactor; |
| 188 | 193 | } |
| 189 | 194 |