diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java index d4d1e3f..c4b1b30 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java @@ -89,6 +89,7 @@ public class CancerScreeningFacade { //根据用户id获取医院ID String hospitalId = autoMatchFacade.getHospitalId(id); CancerScreeningQuery query = getCancerScreeningQuery(queryRequest, hospitalId); + System.out.println(query.convertToQuery().convertToMongoQuery().toString()); List list = new ArrayList(); List modelList = cancerScreenService.queryCancerScreList(query); if (CollectionUtils.isNotEmpty(modelList)) { @@ -352,8 +353,8 @@ public class CancerScreeningFacade { } if (queryRequest.getStartAge() != null && queryRequest.getEndAge() != null) { - query.setBirthdayStart(DateUtil.addYear(new Date(),-queryRequest.getStartAge())); - query.setBirthdayEnd(DateUtil.addYear(new Date(),-queryRequest.getEndAge())); + query.setBirthdayEnd(DateUtil.addYear(new Date(),-queryRequest.getStartAge())); + query.setBirthdayStart(DateUtil.addYear(new Date(),-queryRequest.getEndAge()-1)); } query.setLeftRight(queryRequest.getLeftRight());