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