Commit 50e0fb0af75c5a5c5198989e5118317186af04d3
1 parent
af2946f5c8
Exists in
master
and in
6 other branches
分娩管理放开到28天
Showing 1 changed file with 3 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
50e0fb0
| ... | ... | @@ -1778,10 +1778,10 @@ |
| 1778 | 1778 | |
| 1779 | 1779 | if (matdeliverFollowRequest.getFollowStage() != null) {//按访视阶段查询 |
| 1780 | 1780 | if (matdeliverFollowRequest.getFollowStage() == 1) {//1、访视期内 分娩时间为：21天到当前时间 |
| 1781 | - patientsQuery.setFmDateStart(DateUtil.addDay(new Date(), -22)); | |
| 1781 | + patientsQuery.setFmDateStart(DateUtil.addDay(new Date(), -29)); | |
| 1782 | 1782 | patientsQuery.setFmDateEnd(new Date()); |
| 1783 | 1783 | } else if (matdeliverFollowRequest.getFollowStage() == 2) {//2、超出访视期 分娩时间为：结束时间为：21天前的 |
| 1784 | - patientsQuery.setFmDateEnd(DateUtil.addDay(new Date(), -22)); | |
| 1784 | + patientsQuery.setFmDateEnd(DateUtil.addDay(new Date(), -29)); | |
| 1785 | 1785 | } |
| 1786 | 1786 | } |
| 1787 | 1787 | patientsQuery.setFmHospitalQueryList(hospitalList); |
| ... | ... | @@ -1951,7 +1951,7 @@ |
| 1951 | 1951 | matdeliverFollowListResult.setFollowStage(2); |
| 1952 | 1952 | if (StringUtils.isNotEmpty(deliverModel.getDueDate())) {//根据分娩时间判断访视时间是否过期 |
| 1953 | 1953 | Date resultDate = DateUtil.parseYMD(deliverModel.getDueDate()); |
| 1954 | - boolean isScope = DateUtil.isBetween(resultDate, DateUtil.addDay(new Date(), -22), new Date()); | |
| 1954 | + boolean isScope = DateUtil.isBetween(resultDate, DateUtil.addDay(new Date(), -29), new Date()); | |
| 1955 | 1955 | matdeliverFollowListResult.setFollowStage(isScope ? 1 : 2); |
| 1956 | 1956 | } |
| 1957 | 1957 | matdeliverFollowListResults.add(matdeliverFollowListResult); |