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 3a042e5..cd0529d 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
@@ -233,7 +233,7 @@ public class MatDeliverFacade {
                         patientsService.updatePatient(patientsLocal);
 
                         //修改分娩日期
-                        updatePatientFmDate(patients1.getPid(), fmDate, 1);
+                        updatePatientFmDate(patients1.getPid(), fmDate, 1,patients1.getLastMenses());
                         //修改person表状态为产妇
                         if (StringUtils.isNotEmpty(patients1.getPid())) {
                             PersonModel personModel = new PersonModel();
@@ -348,7 +348,7 @@ public class MatDeliverFacade {
                 patientsService.updatePatient(patients1);
 
                 //修改分娩日期
-                updatePatientFmDate(patients.getPid(), fmDate, 3);
+                updatePatientFmDate(patients.getPid(), fmDate, 3,patients.getLastMenses());
 
                 /** 填写分娩表分娩 >> 作废未使用的产检券 */
 //                remoteService.invalidCoupon(patients.getPid(), "2", RemoteUrlEnum.INVALID_COUPON_URL);
@@ -365,13 +365,15 @@ public class MatDeliverFacade {
      * @param pid
      * @param fmDate
      */
-    private void updatePatientFmDate(String pid, Date fmDate, int type) {
+    private void updatePatientFmDate(String pid, Date fmDate, int type,Date lastMess) {
         PatientsQuery patientsQuery = new PatientsQuery();
         patientsQuery.setPid(pid);
         patientsQuery.setYn(YnEnums.YES.getId());
         patientsQuery.setType(type);
         patientsQuery.setDueStatus(0);
         patientsQuery.setBuildType(1);
+        patientsQuery.setLastMensesStart(lastMess);
+        patientsQuery.setLastMensesEnd(fmDate);
         List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
         for (Patients patients : patientsList) {
             //判断分娩日期是否大于24孕周
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 601e996..3f7774a 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
@@ -15,7 +15,6 @@ import com.lyms.platform.operate.web.utils.*;
 import com.lyms.platform.permission.dao.master.CouponMapper;
 import com.lyms.platform.pojo.*;
 import com.lymsh.platform.reportdata.model.echarts.Series;
-import javafx.scene.shape.Circle;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;