Commit 9309e785704549cbce307873e23ed79d748335b5
1 parent
5a2a7a23e8
Exists in
master
and in
6 other branches
修復访视bug
Showing 1 changed file with 5 additions and 17 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
9309e78
| ... | ... | @@ -1810,7 +1810,7 @@ |
| 1810 | 1810 | patientsQuery.setIsAutoFm(YnEnums.NO.getId()); |
| 1811 | 1811 | patientsQuery.setType(3); |
| 1812 | 1812 | //居住地 注意需要反起查询，不要搞错l，原因：前端小弟把数据存反了 |
| 1813 | - patientsQuery.setAreaRegisterId(matdeliverFollowRequest.getAreaId()); | |
| 1813 | + patientsQuery.setAreaRegisterId(matdeliverFollowRequest.getAreaId()); | |
| 1814 | 1814 | patientsQuery.setCityRegisterId(matdeliverFollowRequest.getCityId()); |
| 1815 | 1815 | patientsQuery.setProvinceRegisterId(matdeliverFollowRequest.getProvinceId()); |
| 1816 | 1816 | patientsQuery.setStreetRegisterId(matdeliverFollowRequest.getStreetId()); |
| ... | ... | @@ -1828,7 +1828,7 @@ |
| 1828 | 1828 | patientsQuery.setFmDateEnd(DateUtil.addDay(new Date(), -29)); |
| 1829 | 1829 | } |
| 1830 | 1830 | } |
| 1831 | - patientsQuery.setFmHospitalQueryList(hospitalList); | |
| 1831 | + //patientsQuery.setFmHospitalQueryList(hospitalList); | |
| 1832 | 1832 | |
| 1833 | 1833 | List<Patients> patientsList = patientsService.queryPatient(patientsQuery); |
| 1834 | 1834 | if (CollectionUtils.isEmpty(patientsList)) { |
| 1835 | 1835 | |
| ... | ... | @@ -1853,9 +1853,9 @@ |
| 1853 | 1853 | c.add(Calendar.YEAR, -Integer.parseInt(startAge)); |
| 1854 | 1854 | Date startDate = c.getTime(); |
| 1855 | 1855 | c.setTime(new Date()); |
| 1856 | - c.add(Calendar.YEAR, - Integer.parseInt(endAge)); | |
| 1856 | + c.add(Calendar.YEAR, - Integer.parseInt(endAge) - 1); | |
| 1857 | 1857 | Date endDate = c.getTime(); |
| 1858 | - List<PersonModel> personModels = mongoTemplate.find(Query.query(Criteria.where("birth").gte(endDate).lte(startDate)), PersonModel.class); | |
| 1858 | + List<PersonModel> personModels = mongoTemplate.find(Query.query(Criteria.where("birth").gte(endDate).lt(startDate)), PersonModel.class); | |
| 1859 | 1859 | for (PersonModel model : personModels) { |
| 1860 | 1860 | pids.add(model.getId()); |
| 1861 | 1861 | } |
| 1862 | 1862 | |
| ... | ... | @@ -1880,22 +1880,10 @@ |
| 1880 | 1880 | matDeliverQuery.setEndStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getEndDay()))); |
| 1881 | 1881 | } |
| 1882 | 1882 | |
| 1883 | - | |
| 1884 | -// if (matdeliverFollowRequest.getFollowStage() != null) {//按访视阶段查询 | |
| 1885 | -// if (matdeliverFollowRequest.getFollowStage() == 1) {//1、访视期内 分娩时间为：21天到当前时间 | |
| 1886 | -// matDeliverQuery.setCreatedStart(DateUtil.addDay(new Date(), -22)); | |
| 1887 | -// matDeliverQuery.setEndStart(new Date()); | |
| 1888 | -// } else if (matdeliverFollowRequest.getFollowStage() == 2) {//2、超出访视期 分娩时间为：结束时间为：21天前的 | |
| 1889 | -// matDeliverQuery.setEndStart(DateUtil.addDay(new Date(), -22)); | |
| 1890 | -// } | |
| 1891 | -// } | |
| 1892 | - | |
| 1893 | 1883 | // 访视列表无需加上分娩医院，因此注释 |
| 1894 | 1884 | //matDeliverQuery.setFmHospitalList(hospitalList); |
| 1895 | 1885 | matDeliverQuery.setFsHospital(hospitalId); |
| 1896 | - if (StringUtils.isNotEmpty(matdeliverFollowRequest.getFsHospitalId())) { | |
| 1897 | - matDeliverQuery.setFsHospitalId(matdeliverFollowRequest.getFsHospitalId()); | |
| 1898 | - } | |
| 1886 | + | |
| 1899 | 1887 | matDeliverQuery.setContactResult(matdeliverFollowRequest.getContactResult()); |
| 1900 | 1888 | if (matdeliverFollowRequest.getContactReason() != null) { |
| 1901 | 1889 | matDeliverQuery.setContactResult(PostpartumFollowMakeEnums.ResultEnum.SB.getId()); |