diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index e599bc7..56617e3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1844,14 +1844,9 @@ public class MatDeliverFacade { // 年龄段 if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(startAge) && com.lyms.platform.common.utils.StringUtils.isNotEmpty(endAge)) { - Calendar c = Calendar.getInstance(); - c.setTime(new Date()); - c.add(Calendar.YEAR, -Integer.parseInt(startAge)); - Date startDate = c.getTime(); - c.setTime(new Date()); - c.add(Calendar.YEAR, - Integer.parseInt(endAge)); - Date endDate = c.getTime(); - List personModels = mongoTemplate.find(Query.query(Criteria.where("birth").gte(endDate).lte(startDate)), PersonModel.class); + long startTime = System.currentTimeMillis() - Integer.parseInt(startAge) * 356 * 24 * 60 * 60 * 1000; + long endTime = System.currentTimeMillis() - Integer.parseInt(endAge) * 356 * 24 * 60 * 60 * 1000; + List personModels = mongoTemplate.find(Query.query(Criteria.where("birth").gte(new Date(startTime)).and("birth").lte(new Date(endTime))), PersonModel.class); for (PersonModel model : personModels) { pids.add(model.getId()); } @@ -1918,18 +1913,16 @@ public class MatDeliverFacade { // 高危等级 String highRiskLevel = matdeliverFollowRequest.getHighRiskLevel(); - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(highRiskLevel)) { - List patientGaoweis = mongoTemplate.find(Query.query(Criteria.where("riskLevelId").regex(highRiskLevel).and("yn").is(1)), Patients.class); - List patientIds = new ArrayList<>(); - for (Patients patient : patientGaoweis) { - patientIds.add(patient.getId()); - } - List parentIdList1 = matDeliverQuery.getParentIdList(); - if (CollectionUtils.isNotEmpty(parentIdList1)) { - patientIds.addAll(parentIdList1); - } - matDeliverQuery.setParentIdList(patientIds); + List patientGaoweis = mongoTemplate.find(Query.query(Criteria.where("riskLevelId").regex(highRiskLevel).and("yn").is("1")), Patients.class); + List patientIds = new ArrayList<>(); + for (Patients patient : patientGaoweis) { + patientIds.add(patient.getId()); + } + List parentIdList1 = matDeliverQuery.getParentIdList(); + if (CollectionUtils.isNotEmpty(parentIdList1)) { + patientIds.addAll(parentIdList1); } + matDeliverQuery.setParentIdList(patientIds); if (StringUtils.isNotEmpty(matdeliverFollowRequest.getNeed())) {//是否分页