diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
index 77b3df8..1183068 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
@@ -5281,4 +5281,31 @@ public class TestController extends BaseController {
         }
         return "success";
     }
+    @RequestMapping(value = "/handleFmData", method = RequestMethod.GET)
+    @ResponseBody
+    public String handleFmData(String start,String end)
+    {
+        StringBuffer sb = new StringBuffer();
+        MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
+        matDeliverQuery.setYn(YnEnums.YES.getId());
+        Date startDate1 = DateUtil.parseYMD(start);
+        Date endDate1 = DateUtil.getDayLastSecond(DateUtil.parseYMD(end));
+        matDeliverQuery.setCreatedTimeStart(startDate1);
+        matDeliverQuery.setCreatedTimeEnd(endDate1);
+        List<MaternalDeliverModel> maternalDeliverModels = matDeliverService.query(matDeliverQuery);
+        if (CollectionUtils.isNotEmpty(maternalDeliverModels))
+        {
+            for (MaternalDeliverModel maternalDeliverModel : maternalDeliverModels)
+            {
+                Patients patients = patientsService.findOnePatientById(maternalDeliverModel.getParentId());
+                if (patients != null && patients.getCardNo() != null)
+                {
+                    sb.append(patients.getCardNo());
+                    sb.append(",");
+                }
+            }
+        }
+        return sb.toString();
+    }
+
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java
index ffe3fbf..797b5bc 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java
@@ -521,11 +521,11 @@ public class SmnFacade {
     public BaseResponse editCqsfRecord(SmnRequest param, Integer userId) {
         Query query = Query.query(Criteria.where("id").is(param.getId()));
         SmnModel smnModel = mongoTemplate.findOne(query, SmnModel.class);
-        BeanUtils.copyProperties(smnModel,param, com.lyms.platform.common.utils.BeanUtils.getNullPropertyNames(smnModel));
-        smnModel.setSfStatus(6);
+        BeanUtils.copyProperties(param,smnModel, com.lyms.platform.common.utils.BeanUtils.getNullPropertyNames(param));
+
         Query query1 = Query.query(Criteria.where("id").is(smnModel.getId()));
         Update update = MongoConvertHelper
-                .convertToNativeUpdate(ReflectionUtils.getUpdateField(param));
+                .convertToNativeUpdate(ReflectionUtils.getUpdateField(smnModel));
         mongoTemplate.updateFirst(query1, update, SmnModel.class);
         return new BaseResponse();
     }
@@ -535,6 +535,7 @@ public class SmnFacade {
         SmnModel smnModel = mongoTemplate.findOne(query, SmnModel.class);
         BeanUtils.copyProperties(smnModel,param, com.lyms.platform.common.utils.BeanUtils.getNullPropertyNames(smnModel));
         param.setSfDate(new Date());
+        smnModel.setSfStatus(6);
         Query query1 = Query.query(Criteria.where("id").is(smnModel.getId()));
         Update update = MongoConvertHelper
                 .convertToNativeUpdate(ReflectionUtils.getUpdateField(param));
@@ -545,10 +546,10 @@ public class SmnFacade {
     public BaseResponse editBabyInfoRecord(SmnRequest param, Integer userId) {
         Query query = Query.query(Criteria.where("id").is(param.getId()));
         SmnModel smnModel = mongoTemplate.findOne(query, SmnModel.class);
-        BeanUtils.copyProperties(smnModel,param, com.lyms.platform.common.utils.BeanUtils.getNullPropertyNames(smnModel));
+        BeanUtils.copyProperties(param,smnModel, com.lyms.platform.common.utils.BeanUtils.getNullPropertyNames(param));
         Query query1 = Query.query(Criteria.where("id").is(smnModel.getId()));
         Update update = MongoConvertHelper
-                .convertToNativeUpdate(ReflectionUtils.getUpdateField(param));
+                .convertToNativeUpdate(ReflectionUtils.getUpdateField(smnModel));
         mongoTemplate.updateFirst(query1, update, SmnModel.class);
         return new BaseResponse();
     }