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 9a2c60a..31ca4cc 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 @@ -1810,7 +1810,7 @@ public class MatDeliverFacade { patientsQuery.setIsAutoFm(YnEnums.NO.getId()); patientsQuery.setType(3); //居住地 注意需要反起查询,不要搞错l,原因:前端小弟把数据存反了 - patientsQuery.setAreaRegisterId(matdeliverFollowRequest.getAreaId()); + patientsQuery.setAreaRegisterId(matdeliverFollowRequest.getAreaId()); patientsQuery.setCityRegisterId(matdeliverFollowRequest.getCityId()); patientsQuery.setProvinceRegisterId(matdeliverFollowRequest.getProvinceId()); patientsQuery.setStreetRegisterId(matdeliverFollowRequest.getStreetId()); @@ -1828,7 +1828,7 @@ public class MatDeliverFacade { patientsQuery.setFmDateEnd(DateUtil.addDay(new Date(), -29)); } } - patientsQuery.setFmHospitalQueryList(hospitalList); + //patientsQuery.setFmHospitalQueryList(hospitalList); List patientsList = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isEmpty(patientsList)) { @@ -1853,9 +1853,9 @@ public class MatDeliverFacade { c.add(Calendar.YEAR, -Integer.parseInt(startAge)); Date startDate = c.getTime(); c.setTime(new Date()); - c.add(Calendar.YEAR, - Integer.parseInt(endAge)); + c.add(Calendar.YEAR, - Integer.parseInt(endAge) - 1); Date endDate = c.getTime(); - List personModels = mongoTemplate.find(Query.query(Criteria.where("birth").gte(endDate).lte(startDate)), PersonModel.class); + List personModels = mongoTemplate.find(Query.query(Criteria.where("birth").gte(endDate).lt(startDate)), PersonModel.class); for (PersonModel model : personModels) { pids.add(model.getId()); } @@ -1880,22 +1880,10 @@ public class MatDeliverFacade { matDeliverQuery.setEndStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getEndDay()))); } - -// if (matdeliverFollowRequest.getFollowStage() != null) {//按访视阶段查询 -// if (matdeliverFollowRequest.getFollowStage() == 1) {//1、访视期内 分娩时间为:21天到当前时间 -// matDeliverQuery.setCreatedStart(DateUtil.addDay(new Date(), -22)); -// matDeliverQuery.setEndStart(new Date()); -// } else if (matdeliverFollowRequest.getFollowStage() == 2) {//2、超出访视期 分娩时间为:结束时间为:21天前的 -// matDeliverQuery.setEndStart(DateUtil.addDay(new Date(), -22)); -// } -// } - // 访视列表无需加上分娩医院,因此注释 //matDeliverQuery.setFmHospitalList(hospitalList); matDeliverQuery.setFsHospital(hospitalId); - if (StringUtils.isNotEmpty(matdeliverFollowRequest.getFsHospitalId())) { - matDeliverQuery.setFsHospitalId(matdeliverFollowRequest.getFsHospitalId()); - } + matDeliverQuery.setContactResult(matdeliverFollowRequest.getContactResult()); if (matdeliverFollowRequest.getContactReason() != null) { matDeliverQuery.setContactResult(PostpartumFollowMakeEnums.ResultEnum.SB.getId());