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());