diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PostpartumReportQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PostpartumReportQuery.java index 0baeead..dd33520 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PostpartumReportQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PostpartumReportQuery.java @@ -6,6 +6,7 @@ import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.utils.StringUtils; +import org.apache.commons.collections.CollectionUtils; import java.util.List; @@ -119,6 +120,9 @@ public class PostpartumReportQuery extends BaseQuery implements IConvertToNative } else if (null != rFactorList && !rFactorList.isEmpty()) { condition = condition.and("riskFactorId", rFactorList, MongoOper.IN); } + if (CollectionUtils.isEmpty(rFactorList)){ + condition = condition.and("risks", false, MongoOper.EXISTS); + } if (deliveryModel!=null){ condition=condition.and("deliveryModel", deliveryModel, MongoOper.IS); }