From 14231859a0470238e0a7feedc3a4daa5e38cc76f Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 9 Jun 2017 14:40:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=B5=E5=AD=90=E7=97=85?= =?UTF-8?q?=E5=8E=86=E4=B8=AD=E4=BA=A7=E7=A8=8B=E4=BD=8D=E7=BD=AE=E5=8F=98?= =?UTF-8?q?=E5=8C=96=E5=AF=BC=E8=87=B4=E4=B8=8A=E4=B8=AA=E4=BA=A7=E7=A8=8B?= =?UTF-8?q?=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AA=E6=93=8D=E4=BD=9C=E6=98=AF?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9=E7=9A=84=EF=BC=8C=E4=BD=86?= =?UTF-8?q?=E6=9C=80=E8=BF=91=E4=BA=A7=E7=A8=8B=E7=9A=84=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=93=8D=E4=BD=9C=E4=B8=8D=E8=83=BD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/operate/web/worker/WorkHR.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) 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 { -- 1.8.3.1