diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java index 2d38257..72e591a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java @@ -188,7 +188,13 @@ public class WorkHR implements Callable> { } } } - if (StringUtils.isNotEmpty(riskPatientsResult.getrFactor()) && StringUtils.isNotEmpty(patients.getoRiskFactor())) { + if (sb.toString().endsWith(",")) { + riskPatientsResult.setrFactor(sb.substring(0, sb.length() - 1)); + } else { + riskPatientsResult.setrFactor(sb.toString()); + } + + if (!"-".equals(riskPatientsResult.getrFactor()) && StringUtils.isNotEmpty(patients.getoRiskFactor())) { riskPatientsResult.setrFactor(riskPatientsResult.getrFactor()+","+patients.getoRiskFactor()); }else if (StringUtils.isNotEmpty(patients.getoRiskFactor())) {