diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmnController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmnController.java
index afce220..1ca94cb 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmnController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmnController.java
@@ -214,7 +214,7 @@ public class SmnController  extends BaseController {
     @RequestMapping(method = RequestMethod.GET, value = "/cacnelApply/{id}")
     @ResponseBody
     @TokenRequired
-    public BaseResponse cacnelApply(@PathVariable String id, HttpServletRequest request) {
+    public BaseResponse cacnelApply(@PathVariable String id,  HttpServletRequest request) {
         return smnFacade.cacnelApply(id, getUserId(request));
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
index cbfaaa7..dfcdd17 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
@@ -4,10 +4,7 @@ import com.lyms.platform.biz.service.*;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.dao.operator.MongoCondition;
 import com.lyms.platform.common.enums.*;
-import com.lyms.platform.common.result.BaseObjectResponse;
-import com.lyms.platform.common.result.BaseResponse;
-import com.lyms.platform.common.result.PageResult;
-import com.lyms.platform.common.result.RespBuilder;
+import com.lyms.platform.common.result.*;
 import com.lyms.platform.common.utils.*;
 import com.lyms.platform.operate.web.result.BabyCheckPageResult;
 import com.lyms.platform.operate.web.result.BabyPageResult;
@@ -3255,19 +3252,25 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl {
         //传入的时间获取年的第一天
         Date startDateFirst=DateUtil.getYearFirst(DateUtil.getYear(startDate));
         DecimalFormat df = new DecimalFormat("0.00");//格式化小数，不足的补0
+
+
+        BabyModelQuery babyModelQuery = new BabyModelQuery();
+        babyModelQuery.setExistSource(false);
+        babyModelQuery.setDataStatus(false);
+        babyModelQuery.setBuildType(2);
+        babyModelQuery.setPregnancyOut("0");
+        babyModelQuery.setHospitalId(hospitalId);
+        babyModelQuery.setBirthStart(startDate);
+        babyModelQuery.setBirthEnd(endDate);
+
         //本月活产数
-        int data1= (int)mongoTemplate.count(new Query(Criteria.
-                where("yn").is(1)
-                .and("baby.pregnancyOut").is("0").and("hospitalId").is(hospitalId)
-                .and("dueDate1").gte(startDate).lte(endDate)),MaternalDeliverModel.class);
+        int data1= (int)mongoTemplate.count(babyModelQuery.convertToQuery().convertToMongoQuery(),BabyModel.class);
 
         int lastDate1= null==hospitalDate.get("data1")?0:Integer.parseInt(hospitalDate.get("data1").toString());
         hospitalDate.put("data1",data1+lastDate1);
         //累计活产数
-        int data2 = (int)mongoTemplate.count(new Query(Criteria.
-                where("yn").is(1)
-                .and("baby.pregnancyOut").is("0").and("hospitalId").is(hospitalId)
-                .and("dueDate1").lte(endDate)),MaternalDeliverModel.class);
+        babyModelQuery.setBirthStart(null);
+        int data2 = (int)mongoTemplate.count(babyModelQuery.convertToQuery().convertToMongoQuery(),BabyModel.class);
 
         int lastDate2= null==hospitalDate.get("data2")?0:Integer.parseInt(hospitalDate.get("data2").toString());
         hospitalDate.put("data2",data2+lastDate2);
@@ -3603,6 +3606,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl {
     }
 
     public BaseResponse getBabyFmList(Integer page, Integer limit, String areaId, String streetId, Date dateTime, Integer type) {
+        List<Map> results = new ArrayList<>();
         //获得区县下的街道
         List<BasicConfig> regions = getRegions(areaId,streetId);
         List<String> hospitalIds = new ArrayList<>();
@@ -3616,16 +3620,63 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl {
         }
         Date startDate=DateUtil.getDateMonthFirst(dateTime);
         Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime));
+        BabyModelQuery babyModelQuery = new BabyModelQuery();
         if (CollectionUtils.isNotEmpty(hospitalIds))
         {
-            //本月活产数
-            Query query = new Query(Criteria.
-                    where("yn").is(1)
-                    .and("baby.pregnancyOut").is("0").and("hospitalId").in(hospitalIds)
-                    .and("dueDate1").gte(startDate).lte(endDate));
-            List<MaternalDeliverModel> datas = mongoTemplate.find(query,MaternalDeliverModel.class);
-            System.out.println(datas);
-        }
-        return null;
+            babyModelQuery.setExistSource(false);
+            babyModelQuery.setDataStatus(false);
+            babyModelQuery.setBuildType(2);
+            babyModelQuery.setPregnancyOut("0");
+            babyModelQuery.setHospitalIdList(hospitalIds);
+
+            babyModelQuery.setPage(page);
+            babyModelQuery.setLimit(limit);
+            babyModelQuery.setNeed("Need");
+            babyModelQuery.setOrder("birth");
+            if (type == 1)
+            { //本月活产数
+                babyModelQuery.setBirthStart(startDate);
+                babyModelQuery.setBirthEnd(endDate);
+            }
+            else
+            { //累计活产数
+                babyModelQuery.setBirthEnd(endDate);
+            }
+            List<BabyModel> datas = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
+            if (CollectionUtils.isNotEmpty(datas))
+            {
+                for (BabyModel model :  datas)
+                {
+                    Map result = new HashMap();
+                    result.put("babyName",model.getName());
+                    result.put("babySex",SexEnum.getTextById(model.getSex()));
+                    result.put("babyWeight",model.getBabyWeight());
+                    result.put("babyHeight",model.getBabyHeight());
+                    result.put("fmDate",DateUtil.getyyyy_MM_dd(model.getBirth()));
+                    result.put("mommyName",model.getMname());
+                    result.put("mommyPhone",model.getMphone());
+                    result.put("mommyCertNo",model.getMcertNo());
+                    String fmHos = "-";
+                    if (StringUtils.isNotEmpty(model.getDeliverOrg()))
+                    {
+                        try{
+                            fmHos =  organizationService.getOrganization(Integer.parseInt(model.getDeliverOrg())).getName();
+                        }catch (Exception e){
+                            fmHos = model.getDeliverOrg();
+                        }
+                    }
+                    result.put("fmHospital",fmHos);
+                    if (StringUtils.isNotEmpty(model.getParentId()))
+                    {
+                        MaternalDeliverModel fmModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId")
+                                .is(model.getParentId())), MaternalDeliverModel.class);
+                        result.put("fmId",fmModel == null ? ""  : fmModel.getId());
+                    }
+                    results.add(result);
+                }
+            }
+        }
+        return new BaseListResponse().setErrorcode(0).setErrormsg("成功")
+                .setData(results).setPageInfo(babyModelQuery.getPageInfo());
     }
 }