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..8dc7c72 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 @@ -193,6 +193,14 @@ public class WorkHR implements Callable> { } 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()); + } + + } List level = new ArrayList(); if (StringUtils.isNotEmpty(patients.getRiskLevelId())) {