Commit 14231859a0470238e0a7feedc3a4daa5e38cc76f
1 parent
526fffe46b
Exists in
master
and in
6 other branches
修改电子病历中产程位置变化导致上个产程最后一个操作是可以修改的，但最近产程的最后一个操作不能修改
Showing 1 changed file with 9 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java
View file @
1423185
| ... | ... | @@ -188,11 +188,16 @@ |
| 188 | 188 | } |
| 189 | 189 | } |
| 190 | 190 | } |
| 191 | - if (sb.toString().endsWith(",")) { | |
| 192 | - riskPatientsResult.setrFactor(sb.substring(0, sb.length() - 1)); | |
| 193 | - } else { | |
| 194 | - riskPatientsResult.setrFactor(sb.toString()); | |
| 191 | + if (StringUtils.isNotEmpty(riskPatientsResult.getrFactor()) && StringUtils.isNotEmpty(patients.getoRiskFactor())) { | |
| 192 | + riskPatientsResult.setrFactor(riskPatientsResult.getrFactor()+","+patients.getoRiskFactor()); | |
| 193 | + }else if (StringUtils.isNotEmpty(patients.getoRiskFactor())) | |
| 194 | + { | |
| 195 | + riskPatientsResult.setrFactor(patients.getoRiskFactor()); | |
| 195 | 196 | } |
| 197 | + } | |
| 198 | + else if (StringUtils.isNotEmpty(patients.getoRiskFactor())) | |
| 199 | + { | |
| 200 | + riskPatientsResult.setrFactor(patients.getoRiskFactor()); | |
| 196 | 201 | } |
| 197 | 202 | List level = new ArrayList(); |
| 198 | 203 | if (StringUtils.isNotEmpty(patients.getRiskLevelId())) { |