diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index b662459..5e9ab3d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -827,7 +827,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService if(patientType != null) { Iterator iterator = patients.iterator(); while (iterator.hasNext()) { - Integer week = DateUtil.getWeek(iterator.next().getLastMenses(), new Date()); + Patients next = iterator.next(); + Integer week = DateUtil.getWeek2(next.getLastMenses(), next.getBookbuildingDate()); if(week != null) { if(patientType == 1 && week > 12) { iterator.remove();