diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java
index 5518c7f..534ba78 100644
--- a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java
+++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java
@@ -163,6 +163,8 @@ public class ConvertHelper {
         babyCheckBase.setForeignId(babyCheckModel.getId());
         babyCheckBase.setNextDate(babyCheckModel.getNextDate());
         babyCheckBase.setModified(babyCheckModel.getModified());
+        //根据规则完善儿保套餐（处理老数据，没有儿保月龄套餐）
+        babyCheckModel.distOldTcType(babyModel);
         babyCheckBase.setTcType(babyCheckModel.getTcType());
         return babyCheckBase;
     }
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 e19778c..8f5a6de 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
@@ -1609,7 +1609,7 @@ public class MatDeliverFacade {
                 // 没传入医院id
                 // 先判断是否传入了传条件
                 // 未传入查询条件
-                if (StringUtils.isEmpty(childbirthManagerRequest.getHospitalProvinceId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalProvinceId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalAreaId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalId())) {
+                if (StringUtils.isEmpty(childbirthManagerRequest.getHospitalProvinceId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalCityId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalAreaId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalId())) {
                     hospitalList.add(autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId()));
                     DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
                     dataPermissionsModelQuery.setUserId(childbirthManagerRequest.getOperatorId());
@@ -1698,6 +1698,7 @@ public class MatDeliverFacade {
             // 这里就设置分页内容
             childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo());
         } else {//否则按常规查询
+            // System.out.println("分娩查询条件："+matDeliverQuery.convertToQuery().convertToMongoQuery());
             maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
         }
         // System.out.println("分娩表查询："+matDeliverQuery.convertToQuery().convertToMongoQuery());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
index 7944fb2..7a7f0f9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
@@ -158,7 +158,15 @@ public class RiskReportFacade {
         query.setLastCheckEmployeeId(patientsQuery.getLastCheckEmployeeId());
         query.setDueDateStart(patientsQuery.getDueDateStart());
         query.setDueDateEnd(patientsQuery.getDueDateEnd());
-
+        //最后一次检查时间
+        if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getLastCTime())) {
+            String nextDateStr = riskPatientsQueryRequest.getLastCTime();
+            String[] dates = nextDateStr.split(" - ");
+            query.setLastCTimeStart(DateUtil.parseYMD(dates[0]));
+            if (dates.length == 2) {
+                query.setLastCTimeEnd(DateUtil.parseYMD(dates[1]));
+            }
+        }
         query.setBookbuildingDateStart(patientsQuery.getBookbuildingDateStart());
         query.setBookbuildingDateEnd(patientsQuery.getBookbuildingDateEnd());
         query.setNotoRiskFactor("");
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java
index c97c976..f27d395 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java
@@ -71,6 +71,8 @@ public class HiskCountTask implements Callable {
                         for (BasicConfig config : configs) {
                             PatientsQuery query = new PatientsQuery();
                             query.setYn(YnEnums.YES.getId());
+                            query.setLastCTimeStart(patientsQuery.getLastCTimeStart());
+                            query.setLastCTimeEnd(patientsQuery.getLastCTimeEnd());
                             query.setBuildTypeList(patientsQuery.getBuildTypeList());
                             query.setHospitalId(patientsQuery.getHospitalId());
                             query.setDueStatus(patientsQuery.getDueStatus());