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 6c43882..28431f9 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
@@ -237,7 +237,7 @@ public class MatDeliverFacade {
                 if (CollectionUtils.isEmpty(babyModels)) {
                     handBaby(deliverAddRequest, babyList, maternalDeliverModel, list, babyIds, parentId, userName, patients1, hospitalId);
                 } else {
-                    maternalDeliverModel.setBaby(updateBaby(deliverAddRequest,list));
+                    maternalDeliverModel.setBaby(updateBaby(deliverAddRequest,list,patients1.getLastMenses()));
                 }
             }
 
@@ -283,7 +283,8 @@ public class MatDeliverFacade {
             List<MatDeliverAddRequest.Baby> list = deliverAddRequest.getBabies();
             //修改小孩信息
             if (CollectionUtils.isNotEmpty(list)) {
-                maternalDeliverModel.setBaby(updateBaby(deliverAddRequest,list));
+                maternalDeliverModel.setBaby(updateBaby(deliverAddRequest,list,patients2.getLastMenses()
+                ));
             }
 
             matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId());
@@ -433,7 +434,7 @@ public class MatDeliverFacade {
      * @param list
      * @return
      */
-    private List updateBaby(MatDeliverAddRequest deliverAddRequest,List<MatDeliverAddRequest.Baby> list ){
+    private List updateBaby(MatDeliverAddRequest deliverAddRequest,List<MatDeliverAddRequest.Baby> list ,Date lastMenses){
         List<MaternalDeliverModel.Baby> babyList = new ArrayList<>();
         for (MatDeliverAddRequest.Baby baby : list) {
             MaternalDeliverModel.Baby babyModel = baby.convertToDataModel();
@@ -456,6 +457,11 @@ public class MatDeliverFacade {
                     fmfs = map.get("fmfs").toString();
                 }
                 babyModel1.setDueType(fmfs);
+
+                if (null != deliverAddRequest.getDueDate()) {
+                    int day = DateUtil.getDays(lastMenses, DateUtil.parseYMD(deliverAddRequest.getDueDate()));
+                    babyModel1.setDueWeek(day / 7);
+                }
                 babyModel1.setBabyHeight(baby.getBabyHeight());
                 babyModel1.setBabyWeight(baby.getBabyWeight());
                 babyService.findAndModify(query.convertToQuery(), babyModel1);
@@ -725,6 +731,12 @@ public class MatDeliverFacade {
             maternalDeliverModel.setYn(YnEnums.NO.getId());
             maternalDeliverModel.setId(id);
             matDeliverService.updateOne(maternalDeliverModel, id);
+            // 删除时设置patient表为自动分娩
+            Patients patients = new Patients();
+            patients.setId(matModel.getParentId());
+            patients.setIsAutoFm(YnEnums.YES.getId());
+            patientsService.updatePatient(patients);
+
             //删除分娩记录的时候删除分娩的小孩信息
             BabyModelQuery babyModelQuery=new BabyModelQuery();
             babyModelQuery.setParentId(matModel.getParentId());