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 d7500ac..b132001 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
@@ -3478,11 +3478,16 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl {
         hospitalDate.put("data16",data15_data2+"%");
         //孕产妇健康管理人数
         PatientsQuery patientsQuery2=new PatientsQuery();
-        patientsQuery2.setYn(YnEnums.YES.getId());
         patientsQuery2.setHospitalId(hospitalId);
+        patientsQuery2.setDueStatus(0);
+        patientsQuery2.setExtEnable(false);
+        patientsQuery2.setBuildTypeNot(1);
+        patientsQuery2.setIsAutoFm(YnEnums.NO.getId());
+        patientsQuery2.setBookbuildingDateStart(DateUtil.addYear(new Date(),-20));
         patientsQuery2.setBookbuildingDateEnd(endDate);
-        patientsQuery2.setFirstCheckId2(true);
-        patientsQuery2.setType(3);
+        patientsQuery2.setYn(YnEnums.YES.getId());
+        patientsQuery2.setExistLastCheckEmployeeId(true);
+        patientsQuery.setType(3);
         int data17 = patientsService.queryPatientCount(patientsQuery2);
         int lastDate17= null==hospitalDate.get("data17")?0:Integer.parseInt(hospitalDate.get("data17").toString());
         hospitalDate.put("data17",data17+lastDate17);
@@ -4249,18 +4254,15 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl {
         PatientsQuery patientsQuery=new PatientsQuery();
         if (CollectionUtils.isNotEmpty(hospitalIds))
         {
-            patientsQuery.setHospitalList(hospitalIds);
             patientsQuery.setDueStatus(0);
+            patientsQuery.setExtEnable(false);
+            patientsQuery.setBuildTypeNot(1);
             patientsQuery.setIsAutoFm(YnEnums.NO.getId());
             patientsQuery.setBookbuildingDateStart(DateUtil.addYear(new Date(),-20));
             patientsQuery.setBookbuildingDateEnd(endDate);
             patientsQuery.setYn(YnEnums.YES.getId());
             patientsQuery.setHospitalList(hospitalIds);
-            patientsQuery.setFirstCheckId2(true);
-            List<Integer> buildType = new ArrayList<Integer>();
-            buildType.add(0);
-            buildType.add(2);
-            patientsQuery.setBuildTypeList(buildType);
+            patientsQuery.setExistLastCheckEmployeeId(true);
             patientsQuery.setType(3);
             patientsQuery.setPage(page);
             patientsQuery.setLimit(limit);