From b6203a5919adfac2c5987cf3636fa85c6138d614 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 22 Jun 2017 09:26:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E5=8E=9F=E6=9D=A5?= =?UTF-8?q?=E8=80=81=E4=BA=A7=E6=A3=80=E5=8A=B5=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/PredictedStatisticsFacade.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java index 898bf8a..cbe63ae 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java @@ -96,7 +96,14 @@ public class PredictedStatisticsFacade { predictedStatisticsQueryModel.setRiskLevelResultModelList(riskLevelResultModelList); predictedStatisticsQueryModel.setRiskLevelNameString(getRiskLevelString(riskLevelResultModelList)); - predictedStatisticsQueryModel.setRiskFactor(getRiskFactor(patients.getRiskFactorId())+patients.getoRiskFactor()); + String risk =getRiskFactor(patients.getRiskFactorId()); + if(StringUtils.isEmpty(risk)){ + risk=(StringUtils.isEmpty(patients.getoRiskFactor())?"":patients.getoRiskFactor()); + }else{ + risk=risk+(StringUtils.isEmpty(patients.getoRiskFactor())?"":","+patients.getoRiskFactor()); + } + + predictedStatisticsQueryModel.setRiskFactor(risk); predictedStatisticsQueryModel.setLastCheckEmployee(getLastCheckEmployee(patients.getLastCheckEmployeeId())); predictedStatisticsQueryModel.setGestationalWeeks(getGestationalWeeks(patients.getLastMenses(), patients.getType(), patients.getDueStatus())); predictedStatisticsQueryModel.setRiskScore(null == patients.getRiskScore() ? "" : patients.getRiskScore().toString()); -- 1.8.3.1