Commit 77be6459f806467e6d191ad4c9c52d6c73538317
1 parent
b1d868025d
Exists in
master
and in
6 other branches
bbbbbb
Showing 1 changed file with 2 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
77be645
| ... | ... | @@ -827,7 +827,8 @@ |
| 827 | 827 | if(patientType != null) { |
| 828 | 828 | Iterator<Patients> iterator = patients.iterator(); |
| 829 | 829 | while (iterator.hasNext()) { |
| 830 | - Integer week = DateUtil.getWeek(iterator.next().getLastMenses(), new Date()); | |
| 830 | + Patients next = iterator.next(); | |
| 831 | + Integer week = DateUtil.getWeek2(next.getLastMenses(), next.getBookbuildingDate()); | |
| 831 | 832 | if(week != null) { |
| 832 | 833 | if(patientType == 1 && week > 12) { |
| 833 | 834 | iterator.remove(); |