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 4d8ad56..898bf8a 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 @@ -95,10 +95,8 @@ public class PredictedStatisticsFacade { List riskLevelResultModelList = getRiskLevel(patients.getRiskLevelId()); predictedStatisticsQueryModel.setRiskLevelResultModelList(riskLevelResultModelList); predictedStatisticsQueryModel.setRiskLevelNameString(getRiskLevelString(riskLevelResultModelList)); - if(StringUtils.isNotEmpty(patients.getoRiskFactor())){ - patients.getRiskFactorId().add(patients.getoRiskFactor()); - } - predictedStatisticsQueryModel.setRiskFactor(getRiskFactor(patients.getRiskFactorId())); + + predictedStatisticsQueryModel.setRiskFactor(getRiskFactor(patients.getRiskFactorId())+patients.getoRiskFactor()); predictedStatisticsQueryModel.setLastCheckEmployee(getLastCheckEmployee(patients.getLastCheckEmployeeId())); predictedStatisticsQueryModel.setGestationalWeeks(getGestationalWeeks(patients.getLastMenses(), patients.getType(), patients.getDueStatus())); predictedStatisticsQueryModel.setRiskScore(null == patients.getRiskScore() ? "" : patients.getRiskScore().toString());