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 8bd423c..4d8ad56 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 @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.BasicConfigService; +import com.lyms.platform.biz.service.CommonService; import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.RiskDefaultTypeEnum; @@ -18,6 +19,7 @@ import com.lyms.platform.pojo.Patients; import com.lyms.platform.pojo.PredictedStatisticsCountModel; import com.lyms.platform.query.PatientsQuery; import net.sf.json.JSONArray; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -93,6 +95,9 @@ 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.setLastCheckEmployee(getLastCheckEmployee(patients.getLastCheckEmployeeId())); predictedStatisticsQueryModel.setGestationalWeeks(getGestationalWeeks(patients.getLastMenses(), patients.getType(), patients.getDueStatus()));