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 bfee698..2d38257 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,12 +188,17 @@ public class WorkHR implements Callable> { } } } - if (sb.toString().endsWith(",")) { - riskPatientsResult.setrFactor(sb.substring(0, sb.length() - 1)); - } else { - riskPatientsResult.setrFactor(sb.toString()); + if (StringUtils.isNotEmpty(riskPatientsResult.getrFactor()) && StringUtils.isNotEmpty(patients.getoRiskFactor())) { + riskPatientsResult.setrFactor(riskPatientsResult.getrFactor()+","+patients.getoRiskFactor()); + }else if (StringUtils.isNotEmpty(patients.getoRiskFactor())) + { + riskPatientsResult.setrFactor(patients.getoRiskFactor()); } } + else if (StringUtils.isNotEmpty(patients.getoRiskFactor())) + { + riskPatientsResult.setrFactor(patients.getoRiskFactor()); + } List level = new ArrayList(); if (StringUtils.isNotEmpty(patients.getRiskLevelId())) { try {