diff --git a/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java index 996164a..c0da192 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java @@ -9,7 +9,9 @@ import com.lyms.platform.common.utils.StringUtils; import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.data.mongodb.core.query.Criteria; +import java.util.Date; import java.util.List; @@ -36,6 +38,31 @@ public class TrackDownRecordQuery extends BaseQuery implements IConvertToNativeQ private String parentId; private List pids; private String hospitalId; + /** + * 末次月经 + */ + private Date lastMensesStart; + + /** + * 末次月经 + */ + private Date lastMensesEnd; + + public Date getLastMensesStart() { + return lastMensesStart; + } + + public void setLastMensesStart(Date lastMensesStart) { + this.lastMensesStart = lastMensesStart; + } + + public Date getLastMensesEnd() { + return lastMensesEnd; + } + + public void setLastMensesEnd(Date lastMensesEnd) { + this.lastMensesEnd = lastMensesEnd; + } public String getHospitalId() { return hospitalId; @@ -135,6 +162,24 @@ public class TrackDownRecordQuery extends BaseQuery implements IConvertToNativeQ if (null != pids) { condition = condition.and("pid", pids, MongoOper.IN); } + Criteria c1 = null; + if (null != lastMensesStart) { + if (null != c1) { + c1 = c1.and("lastMenses").gte(lastMensesStart); + } else { + c1 = Criteria.where("lastMenses").gte(lastMensesStart); + } + } + if (null != lastMensesEnd) { + if (c1 != null) { + c1 = c1.lte(lastMensesEnd); + } else { + c1 = Criteria.where("lastMenses").lte(lastMensesEnd); + } + } + if (null != c1) { + condition = condition.andCondition(new MongoCondition(c1)); + } return condition.toMongoQuery(); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index 0f7e2e4..1ad2c11 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -91,6 +91,11 @@ public class TrackDownFacade { downRecordQuery.setCityId(downQueryRequest.getCityId()); downRecordQuery.setStreetId(downQueryRequest.getStreetId()); downRecordQuery.setTrackType(downQueryRequest.getTrackType()); + //如果是产筛请求 + if(null!=downQueryRequest.getTrackType() && TrackDownDateEnums.D.getId()==downQueryRequest.getTrackType()){ + downRecordQuery.setLastMensesEnd(DateUtil.addDay(DateUtil.formatDate(new Date()),-140)); + downRecordQuery.setTrackType(3); + } downRecordQuery.setPage(downQueryRequest.getPage()); downRecordQuery.setLimit(downQueryRequest.getLimit()); downRecordQuery.setNeed("1");