diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyAutismDoubleSievingMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyAutismDoubleSievingMapper.java
index 1b06c7e..94c10ad 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyAutismDoubleSievingMapper.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyAutismDoubleSievingMapper.java
@@ -1,8 +1,8 @@
 package com.lyms.platform.permission.dao.master;
 
+import com.lyms.platform.common.dao.BaseQuery;
 import com.lyms.platform.pojo.BabyAutismDoubleSieving;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 
@@ -29,7 +29,7 @@ public interface BabyAutismDoubleSievingMapper {
      * @param pageable         分页对象
      * @return 对象列表
      */
-    List<BabyAutismDoubleSieving> queryAllByLimit(BabyAutismDoubleSieving babyAutismDoubleSieving, @Param("pageable") Pageable pageable);
+    List<BabyAutismDoubleSieving> queryAllByLimit(@Param("doubleSieving")BabyAutismDoubleSieving babyAutismDoubleSieving, @Param("pageable") BaseQuery pageable);
 
     /**
      * 统计总行数
@@ -37,7 +37,7 @@ public interface BabyAutismDoubleSievingMapper {
      * @param babyAutismDoubleSieving 查询条件
      * @return 总行数
      */
-    long count(BabyAutismDoubleSieving babyAutismDoubleSieving);
+    long count(@Param("doubleSieving")BabyAutismDoubleSieving babyAutismDoubleSieving);
 
     /**
      * 新增数据
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyAutismDoubleSievingService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyAutismDoubleSievingService.java
index 2d04dd8..a3471a4 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyAutismDoubleSievingService.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyAutismDoubleSievingService.java
@@ -1,8 +1,7 @@
 package com.lyms.platform.permission.service;
 
+import com.lyms.platform.common.dao.BaseQuery;
 import com.lyms.platform.pojo.BabyAutismDoubleSieving;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
 
 import java.util.List;
 
@@ -29,7 +28,7 @@ public interface BabyAutismDoubleSievingService {
      * @param pageRequest      分页对象
      * @return 查询结果
      */
-    Page<BabyAutismDoubleSieving> queryByPage(BabyAutismDoubleSieving babyAutismDoubleSieving, PageRequest pageRequest);
+    List<BabyAutismDoubleSieving> queryByPage(BabyAutismDoubleSieving babyAutismDoubleSieving, BaseQuery pageRequest);
 
     /**
      * 新增数据
@@ -57,4 +56,5 @@ public interface BabyAutismDoubleSievingService {
 
     List<BabyAutismDoubleSieving> queryListByBabyId(String babyId);
 
+    Long count(BabyAutismDoubleSieving babyAutismDoubleSieving, BaseQuery pageRequest);
 }
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyAutismDoubleSievingServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyAutismDoubleSievingServiceImpl.java
index 78411b7..bcfd6c6 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyAutismDoubleSievingServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyAutismDoubleSievingServiceImpl.java
@@ -1,5 +1,6 @@
 package com.lyms.platform.permission.service.impl;
 
+import com.lyms.platform.common.dao.BaseQuery;
 import com.lyms.platform.permission.dao.master.BabyAutismDoubleSievingMapper;
 import com.lyms.platform.permission.service.BabyAutismDoubleSievingService;
 import com.lyms.platform.pojo.BabyAutismDoubleSieving;
@@ -41,9 +42,8 @@ public class BabyAutismDoubleSievingServiceImpl implements BabyAutismDoubleSievi
      * @return 查询结果
      */
     @Override
-    public Page<BabyAutismDoubleSieving> queryByPage(BabyAutismDoubleSieving babyAutismDoubleSieving, PageRequest pageRequest) {
-        long total = this.babyAutismDoubleSievingDao.count(babyAutismDoubleSieving);
-        return new PageImpl<>(this.babyAutismDoubleSievingDao.queryAllByLimit(babyAutismDoubleSieving, pageRequest), pageRequest, total);
+    public List<BabyAutismDoubleSieving> queryByPage(BabyAutismDoubleSieving babyAutismDoubleSieving, BaseQuery pageRequest) {
+        return this.babyAutismDoubleSievingDao.queryAllByLimit(babyAutismDoubleSieving, pageRequest);
     }
 
     /**
@@ -85,4 +85,9 @@ public class BabyAutismDoubleSievingServiceImpl implements BabyAutismDoubleSievi
     public List<BabyAutismDoubleSieving> queryListByBabyId(String babyId) {
         return babyAutismDoubleSievingDao.queryListByBabyId(babyId);
     }
+
+    @Override
+    public Long count(BabyAutismDoubleSieving babyAutismDoubleSieving, BaseQuery pageRequest) {
+        return babyAutismDoubleSievingDao.count(babyAutismDoubleSieving);
+    }
 }
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismDoubleSievingDao.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismDoubleSievingDao.xml
index 880bfe5..35a3fb8 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismDoubleSievingDao.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismDoubleSievingDao.xml
@@ -66,146 +66,146 @@
         id, created, modified, yn, operater_id, hospital_id, baby_id, baby_build_date, baby_name, baby_sex, baby_m_name, baby_f_name, baby_m_phone, baby_f_phone, baby_m_cert_no, baby_f_cert_no, pid, check_month_age, check_month_id, birth, check_time, next_check_time, check_doctor, doctor_sign, patient_sign, preliminary_screening_results, preliminary_screening_results_failed_project, medical_history, medical_history_remark, developer_quotient, big_movement, fine_motion, adaptability, language_num, social_behavior, pediatric_heart_scale_assess_mentresults, core_project_num, positivet_num, screening_scale_mentresults, behavior_rating_scale_total, feel_num, social_interaction_num, body_movement_num, behavior_rating_language_num, self_care_in_daily_life_num, behavior_rating_scale_assess_mentresults, rescreen_results
         from baby_autism_double_sieving
         <where>
-            <if test="id != null and id != ''">
-                and id = #{id}
+            <if test="doubleSieving.id != null and doubleSieving.id != ''">
+                and id = #{doubleSieving.id}
             </if>
-            <if test="created != null and created != ''">
-                and created = #{created}
+            <if test="doubleSieving.created != null ">
+                and created = #{doubleSieving.created}
             </if>
-            <if test="modified != null and modified != ''">
-                and modified = #{modified}
+            <if test="doubleSieving.modified != null ">
+                and modified = #{doubleSieving.modified}
             </if>
-            <if test="yn != null">
-                and yn = #{yn}
+            <if test="doubleSieving.yn != null">
+                and yn = #{doubleSieving.yn}
             </if>
-            <if test="operaterId != null and operaterId != ''">
-                and operater_id = #{operaterId}
+            <if test="doubleSieving.operaterId != null and doubleSieving.operaterId != ''">
+                and operater_id = #{doubleSieving.operaterId}
             </if>
-            <if test="hospitalId != null and hospitalId != ''">
-                and hospital_id = #{hospitalId}
+            <if test="doubleSieving.hospitalId != null and doubleSieving.hospitalId != ''">
+                and hospital_id = #{doubleSieving.hospitalId}
             </if>
-            <if test="babyId != null and babyId != ''">
-                and baby_id = #{babyId}
+            <if test="doubleSieving.babyId != null and doubleSieving.babyId != ''">
+                and baby_id = #{doubleSieving.babyId}
             </if>
-            <if test="babyBuildDate != null and babyBuildDate != ''">
-                and baby_build_date = #{babyBuildDate}
+            <if test="doubleSieving.babyBuildDate != null ">
+                and baby_build_date = #{doubleSieving.babyBuildDate}
             </if>
-            <if test="babyName != null and babyName != ''">
-                and baby_name = #{babyName}
+            <if test="doubleSieving.babyName != null and doubleSieving.babyName != ''">
+                and baby_name = #{doubleSieving.babyName}
             </if>
-            <if test="babySex != null">
-                and baby_sex = #{babySex}
+            <if test="doubleSieving.babySex != null">
+                and baby_sex = #{doubleSieving.babySex}
             </if>
-            <if test="babyMName != null and babyMName != ''">
-                and baby_m_name = #{babyMName}
+            <if test="doubleSieving.babyMName != null and doubleSieving.babyMName != ''">
+                and baby_m_name = #{doubleSieving.babyMName}
             </if>
-            <if test="babyFName != null and babyFName != ''">
-                and baby_f_name = #{babyFName}
+            <if test="doubleSieving.babyFName != null and doubleSieving.babyFName != ''">
+                and baby_f_name = #{doubleSieving.babyFName}
             </if>
-            <if test="babyMPhone != null and babyMPhone != ''">
-                and baby_m_phone = #{babyMPhone}
+            <if test="doubleSieving.babyMPhone != null and doubleSieving.babyMPhone != ''">
+                and baby_m_phone = #{doubleSieving.babyMPhone}
             </if>
-            <if test="babyFPhone != null and babyFPhone != ''">
-                and baby_f_phone = #{babyFPhone}
+            <if test="doubleSieving.babyFPhone != null and doubleSieving.babyFPhone != ''">
+                and baby_f_phone = #{doubleSieving.babyFPhone}
             </if>
-            <if test="babyMCertNo != null and babyMCertNo != ''">
-                and baby_m_cert_no = #{babyMCertNo}
+            <if test="doubleSieving.babyMCertNo != null and doubleSieving.babyMCertNo != ''">
+                and baby_m_cert_no = #{doubleSieving.babyMCertNo}
             </if>
-            <if test="babyFCertNo != null and babyFCertNo != ''">
-                and baby_f_cert_no = #{babyFCertNo}
+            <if test="doubleSieving.babyFCertNo != null and doubleSieving.babyFCertNo != ''">
+                and baby_f_cert_no = #{doubleSieving.babyFCertNo}
             </if>
-            <if test="pid != null and pid != ''">
-                and pid = #{pid}
+            <if test="doubleSieving.pid != null and doubleSieving.pid != ''">
+                and pid = #{doubleSieving.pid}
             </if>
-            <if test="checkMonthAge != null and checkMonthAge != ''">
-                and check_month_age = #{checkMonthAge}
+            <if test="doubleSieving.checkMonthAge != null and doubleSieving.checkMonthAge != ''">
+                and check_month_age = #{doubleSieving.checkMonthAge}
             </if>
-            <if test="checkMonthId != null and checkMonthId != ''">
-                and check_month_id = #{checkMonthId}
+            <if test="doubleSieving.checkMonthId != null and doubleSieving.checkMonthId != ''">
+                and check_month_id = #{doubleSieving.checkMonthId}
             </if>
-            <if test="birth != null and birth != ''">
-                and birth = #{birth}
+            <if test="doubleSieving.birth != null ">
+                and birth = #{doubleSieving.birth}
             </if>
-            <if test="checkTime != null and checkTime != ''">
-                and check_time = #{checkTime}
+            <if test="doubleSieving.checkTime != null">
+                and check_time = #{doubleSieving.checkTime}
             </if>
-            <if test="nextCheckTime != null and nextCheckTime != ''">
-                and next_check_time = #{nextCheckTime}
+            <if test="doubleSieving.nextCheckTime != null">
+                and next_check_time = #{doubleSieving.nextCheckTime}
             </if>
-            <if test="checkDoctor != null and checkDoctor != ''">
-                and check_doctor = #{checkDoctor}
+            <if test="doubleSieving.checkDoctor != null and doubleSieving.checkDoctor != ''">
+                and check_doctor = #{doubleSieving.checkDoctor}
             </if>
-            <if test="doctorSign != null and doctorSign != ''">
-                and doctor_sign = #{doctorSign}
+            <if test="doubleSieving.doctorSign != null and doubleSieving.doctorSign != ''">
+                and doctor_sign = #{doubleSieving.doctorSign}
             </if>
-            <if test="patientSign != null and patientSign != ''">
-                and patient_sign = #{patientSign}
+            <if test="doubleSieving.patientSign != null and doubleSieving.patientSign != ''">
+                and patient_sign = #{doubleSieving.patientSign}
             </if>
-            <if test="preliminaryScreeningResults != null and preliminaryScreeningResults != ''">
-                and preliminary_screening_results = #{preliminaryScreeningResults}
+            <if test="doubleSieving.preliminaryScreeningResults != null and doubleSieving.preliminaryScreeningResults != ''">
+                and preliminary_screening_results = #{pdoubleSieving.reliminaryScreeningResults}
             </if>
-            <if test="preliminaryScreeningResultsFailedProject != null and preliminaryScreeningResultsFailedProject != ''">
-                and preliminary_screening_results_failed_project = #{preliminaryScreeningResultsFailedProject}
+            <if test="doubleSieving.preliminaryScreeningResultsFailedProject != null and doubleSieving.preliminaryScreeningResultsFailedProject != ''">
+                and preliminary_screening_results_failed_project = #{doubleSieving.preliminaryScreeningResultsFailedProject}
             </if>
-            <if test="medicalHistoryName != null and medicalHistoryName != ''">
-                and medical_history = #{medicalHistoryName}
+            <if test="doubleSieving.medicalHistoryName != null and doubleSieving.medicalHistoryName != ''">
+                and medical_history = #{doubleSieving.medicalHistoryName}
             </if>
-            <if test="medicalHistoryRemark != null and medicalHistoryRemark != ''">
-                and medical_history_remark = #{medicalHistoryRemark}
+            <if test="doubleSieving.medicalHistoryRemark != null and doubleSieving.medicalHistoryRemark != ''">
+                and medical_history_remark = #{doubleSieving.medicalHistoryRemark}
             </if>
-            <if test="developerQuotient != null and developerQuotient != ''">
-                and developer_quotient = #{developerQuotient}
+            <if test="doubleSieving.developerQuotient != null and doubleSieving.developerQuotient != ''">
+                and developer_quotient = #{doubleSieving.developerQuotient}
             </if>
-            <if test="bigMovement != null and bigMovement != ''">
-                and big_movement = #{bigMovement}
+            <if test="doubleSieving.bigMovement != null and doubleSieving.bigMovement != ''">
+                and big_movement = #{doubleSieving.bigMovement}
             </if>
-            <if test="fineMotion != null and fineMotion != ''">
-                and fine_motion = #{fineMotion}
+            <if test="doubleSieving.fineMotion != null and doubleSieving.fineMotion != ''">
+                and fine_motion = #{doubleSieving.fineMotion}
             </if>
-            <if test="adaptability != null and adaptability != ''">
-                and adaptability = #{adaptability}
+            <if test="doubleSieving.adaptability != null and doubleSieving.adaptability != ''">
+                and adaptability = #{doubleSieving.adaptability}
             </if>
-            <if test="languageNum != null and languageNum != ''">
-                and language_num = #{languageNum}
+            <if test="doubleSieving.languageNum != null and doubleSieving.languageNum != ''">
+                and language_num = #{doubleSieving.languageNum}
             </if>
-            <if test="socialBehavior != null and socialBehavior != ''">
-                and social_behavior = #{socialBehavior}
+            <if test="doubleSieving.socialBehavior != null and doubleSieving.socialBehavior != ''">
+                and social_behavior = #{doubleSieving.socialBehavior}
             </if>
-            <if test="pediatricHeartScaleAssessMentresults != null and pediatricHeartScaleAssessMentresults != ''">
-                and pediatric_heart_scale_assess_mentresults = #{pediatricHeartScaleAssessMentresults}
+            <if test="doubleSieving.pediatricHeartScaleAssessMentresults != null and doubleSieving.pediatricHeartScaleAssessMentresults != ''">
+                and pediatric_heart_scale_assess_mentresults = #{doubleSieving.pediatricHeartScaleAssessMentresults}
             </if>
-            <if test="coreProjectNum != null and coreProjectNum != ''">
-                and core_project_num = #{coreProjectNum}
+            <if test="doubleSieving.coreProjectNum != null and doubleSieving.coreProjectNum != ''">
+                and core_project_num = #{doubleSieving.coreProjectNum}
             </if>
-            <if test="positivetNum != null and positivetNum != ''">
-                and positivet_num = #{positivetNum}
+            <if test="doubleSieving.positivetNum != null and doubleSieving.positivetNum != ''">
+                and positivet_num = #{doubleSieving.positivetNum}
             </if>
-            <if test="screeningScaleMentresults != null and screeningScaleMentresults != ''">
-                and screening_scale_mentresults = #{screeningScaleMentresults}
+            <if test="doubleSieving.screeningScaleMentresults != null and doubleSieving.screeningScaleMentresults != ''">
+                and screening_scale_mentresults = #{doubleSieving.screeningScaleMentresults}
             </if>
-            <if test="behaviorRatingScaleTotal != null and behaviorRatingScaleTotal != ''">
-                and behavior_rating_scale_total = #{behaviorRatingScaleTotal}
+            <if test="doubleSieving.behaviorRatingScaleTotal != null and doubleSieving.behaviorRatingScaleTotal != ''">
+                and behavior_rating_scale_total = #{doubleSieving.behaviorRatingScaleTotal}
             </if>
-            <if test="feelNum != null and feelNum != ''">
-                and feel_num = #{feelNum}
+            <if test="doubleSieving.feelNum != null and doubleSieving.feelNum != ''">
+                and feel_num = #{doubleSieving.feelNum}
             </if>
-            <if test="socialInteractionNum != null and socialInteractionNum != ''">
-                and social_interaction_num = #{socialInteractionNum}
+            <if test="doubleSieving.socialInteractionNum != null and doubleSieving.socialInteractionNum != ''">
+                and social_interaction_num = #{doubleSieving.socialInteractionNum}
             </if>
-            <if test="bodyMovementNum != null and bodyMovementNum != ''">
-                and body_movement_num = #{bodyMovementNum}
+            <if test="doubleSieving.bodyMovementNum != null and doubleSieving.bodyMovementNum != ''">
+                and body_movement_num = #{doubleSieving.bodyMovementNum}
             </if>
-            <if test="behaviorRatingLanguageNum != null and behaviorRatingLanguageNum != ''">
-                and behavior_rating_language_num = #{behaviorRatingLanguageNum}
+            <if test="doubleSieving.behaviorRatingLanguageNum != null and doubleSieving.behaviorRatingLanguageNum != ''">
+                and behavior_rating_language_num = #{doubleSieving.behaviorRatingLanguageNum}
             </if>
-            <if test="selfCareInDailyLifeNum != null and selfCareInDailyLifeNum != ''">
-                and self_care_in_daily_life_num = #{selfCareInDailyLifeNum}
+            <if test="doubleSieving.selfCareInDailyLifeNum != null and doubleSieving.selfCareInDailyLifeNum != ''">
+                and self_care_in_daily_life_num = #{doubleSieving.selfCareInDailyLifeNum}
             </if>
-            <if test="behaviorRatingScaleAssessMentresults != null and behaviorRatingScaleAssessMentresults != ''">
-                and behavior_rating_scale_assess_mentresults = #{behaviorRatingScaleAssessMentresults}
+            <if test="doubleSieving.behaviorRatingScaleAssessMentresults != null and doubleSieving.behaviorRatingScaleAssessMentresults != ''">
+                and behavior_rating_scale_assess_mentresults = #{doubleSieving.behaviorRatingScaleAssessMentresults}
             </if>
-            <if test="rescreenResults != null and rescreenResults != ''">
-                and rescreen_results = #{rescreenResults}
+            <if test="doubleSieving.rescreenResults != null and doubleSieving.rescreenResults != ''">
+                and rescreen_results = #{doubleSieving.rescreenResults}
             </if>
         </where>
         limit #{pageable.offset}, #{pageable.pageSize}
@@ -216,146 +216,146 @@
         select count(1)
         from baby_autism_double_sieving
         <where>
-            <if test="id != null and id != ''">
-                and id = #{id}
+            <if test="doubleSieving.id != null and doubleSieving.id != ''">
+                and id = #{doubleSieving.id}
             </if>
-            <if test="created != null and created != ''">
-                and created = #{created}
+            <if test="doubleSieving.created != null ">
+                and created = #{doubleSieving.created}
             </if>
-            <if test="modified != null and modified != ''">
-                and modified = #{modified}
+            <if test="doubleSieving.modified != null ">
+                and modified = #{doubleSieving.modified}
             </if>
-            <if test="yn != null">
-                and yn = #{yn}
+            <if test="doubleSieving.yn != null">
+                and yn = #{doubleSieving.yn}
             </if>
-            <if test="operaterId != null and operaterId != ''">
-                and operater_id = #{operaterId}
+            <if test="doubleSieving.operaterId != null and doubleSieving.operaterId != ''">
+                and operater_id = #{doubleSieving.operaterId}
             </if>
-            <if test="hospitalId != null and hospitalId != ''">
-                and hospital_id = #{hospitalId}
+            <if test="doubleSieving.hospitalId != null and doubleSieving.hospitalId != ''">
+                and hospital_id = #{doubleSieving.hospitalId}
             </if>
-            <if test="babyId != null and babyId != ''">
-                and baby_id = #{babyId}
+            <if test="doubleSieving.babyId != null and doubleSieving.babyId != ''">
+                and baby_id = #{doubleSieving.babyId}
             </if>
-            <if test="babyBuildDate != null and babyBuildDate != ''">
-                and baby_build_date = #{babyBuildDate}
+            <if test="doubleSieving.babyBuildDate != null ">
+                and baby_build_date = #{doubleSieving.babyBuildDate}
             </if>
-            <if test="babyName != null and babyName != ''">
-                and baby_name = #{babyName}
+            <if test="doubleSieving.babyName != null and doubleSieving.babyName != ''">
+                and baby_name = #{doubleSieving.babyName}
             </if>
-            <if test="babySex != null">
-                and baby_sex = #{babySex}
+            <if test="doubleSieving.babySex != null">
+                and baby_sex = #{doubleSieving.babySex}
             </if>
-            <if test="babyMName != null and babyMName != ''">
-                and baby_m_name = #{babyMName}
+            <if test="doubleSieving.babyMName != null and doubleSieving.babyMName != ''">
+                and baby_m_name = #{doubleSieving.babyMName}
             </if>
-            <if test="babyFName != null and babyFName != ''">
-                and baby_f_name = #{babyFName}
+            <if test="doubleSieving.babyFName != null and doubleSieving.babyFName != ''">
+                and baby_f_name = #{doubleSieving.babyFName}
             </if>
-            <if test="babyMPhone != null and babyMPhone != ''">
-                and baby_m_phone = #{babyMPhone}
+            <if test="doubleSieving.babyMPhone != null and doubleSieving.babyMPhone != ''">
+                and baby_m_phone = #{doubleSieving.babyMPhone}
             </if>
-            <if test="babyFPhone != null and babyFPhone != ''">
-                and baby_f_phone = #{babyFPhone}
+            <if test="doubleSieving.babyFPhone != null and doubleSieving.babyFPhone != ''">
+                and baby_f_phone = #{doubleSieving.babyFPhone}
             </if>
-            <if test="babyMCertNo != null and babyMCertNo != ''">
-                and baby_m_cert_no = #{babyMCertNo}
+            <if test="doubleSieving.babyMCertNo != null and doubleSieving.babyMCertNo != ''">
+                and baby_m_cert_no = #{doubleSieving.babyMCertNo}
             </if>
-            <if test="babyFCertNo != null and babyFCertNo != ''">
-                and baby_f_cert_no = #{babyFCertNo}
+            <if test="doubleSieving.babyFCertNo != null and doubleSieving.babyFCertNo != ''">
+                and baby_f_cert_no = #{doubleSieving.babyFCertNo}
             </if>
-            <if test="pid != null and pid != ''">
-                and pid = #{pid}
+            <if test="doubleSieving.pid != null and doubleSieving.pid != ''">
+                and pid = #{doubleSieving.pid}
             </if>
-            <if test="checkMonthAge != null and checkMonthAge != ''">
-                and check_month_age = #{checkMonthAge}
+            <if test="doubleSieving.checkMonthAge != null and doubleSieving.checkMonthAge != ''">
+                and check_month_age = #{doubleSieving.checkMonthAge}
             </if>
-            <if test="checkMonthId != null and checkMonthId != ''">
-                and check_month_id = #{checkMonthId}
+            <if test="doubleSieving.checkMonthId != null and doubleSieving.checkMonthId != ''">
+                and check_month_id = #{doubleSieving.checkMonthId}
             </if>
-            <if test="birth != null and birth != ''">
-                and birth = #{birth}
+            <if test="doubleSieving.birth != null ">
+                and birth = #{doubleSieving.birth}
             </if>
-            <if test="checkTime != null and checkTime != ''">
-                and check_time = #{checkTime}
+            <if test="doubleSieving.checkTime != null">
+                and check_time = #{doubleSieving.checkTime}
             </if>
-            <if test="nextCheckTime != null and nextCheckTime != ''">
-                and next_check_time = #{nextCheckTime}
+            <if test="doubleSieving.nextCheckTime != null">
+                and next_check_time = #{doubleSieving.nextCheckTime}
             </if>
-            <if test="checkDoctor != null and checkDoctor != ''">
-                and check_doctor = #{checkDoctor}
+            <if test="doubleSieving.checkDoctor != null and doubleSieving.checkDoctor != ''">
+                and check_doctor = #{doubleSieving.checkDoctor}
             </if>
-            <if test="doctorSign != null and doctorSign != ''">
-                and doctor_sign = #{doctorSign}
+            <if test="doubleSieving.doctorSign != null and doubleSieving.doctorSign != ''">
+                and doctor_sign = #{doubleSieving.doctorSign}
             </if>
-            <if test="patientSign != null and patientSign != ''">
-                and patient_sign = #{patientSign}
+            <if test="doubleSieving.patientSign != null and doubleSieving.patientSign != ''">
+                and patient_sign = #{doubleSieving.patientSign}
             </if>
-            <if test="preliminaryScreeningResults != null and preliminaryScreeningResults != ''">
-                and preliminary_screening_results = #{preliminaryScreeningResults}
+            <if test="doubleSieving.preliminaryScreeningResults != null and doubleSieving.preliminaryScreeningResults != ''">
+                and preliminary_screening_results = #{pdoubleSieving.reliminaryScreeningResults}
             </if>
-            <if test="preliminaryScreeningResultsFailedProject != null and preliminaryScreeningResultsFailedProject != ''">
-                and preliminary_screening_results_failed_project = #{preliminaryScreeningResultsFailedProject}
+            <if test="doubleSieving.preliminaryScreeningResultsFailedProject != null and doubleSieving.preliminaryScreeningResultsFailedProject != ''">
+                and preliminary_screening_results_failed_project = #{doubleSieving.preliminaryScreeningResultsFailedProject}
             </if>
-            <if test="medicalHistoryName != null and medicalHistoryName != ''">
-                and medical_history = #{medicalHistoryName}
+            <if test="doubleSieving.medicalHistoryName != null and doubleSieving.medicalHistoryName != ''">
+                and medical_history = #{doubleSieving.medicalHistoryName}
             </if>
-            <if test="medicalHistoryRemark != null and medicalHistoryRemark != ''">
-                and medical_history_remark = #{medicalHistoryRemark}
+            <if test="doubleSieving.medicalHistoryRemark != null and doubleSieving.medicalHistoryRemark != ''">
+                and medical_history_remark = #{doubleSieving.medicalHistoryRemark}
             </if>
-            <if test="developerQuotient != null and developerQuotient != ''">
-                and developer_quotient = #{developerQuotient}
+            <if test="doubleSieving.developerQuotient != null and doubleSieving.developerQuotient != ''">
+                and developer_quotient = #{doubleSieving.developerQuotient}
             </if>
-            <if test="bigMovement != null and bigMovement != ''">
-                and big_movement = #{bigMovement}
+            <if test="doubleSieving.bigMovement != null and doubleSieving.bigMovement != ''">
+                and big_movement = #{doubleSieving.bigMovement}
             </if>
-            <if test="fineMotion != null and fineMotion != ''">
-                and fine_motion = #{fineMotion}
+            <if test="doubleSieving.fineMotion != null and doubleSieving.fineMotion != ''">
+                and fine_motion = #{doubleSieving.fineMotion}
             </if>
-            <if test="adaptability != null and adaptability != ''">
-                and adaptability = #{adaptability}
+            <if test="doubleSieving.adaptability != null and doubleSieving.adaptability != ''">
+                and adaptability = #{doubleSieving.adaptability}
             </if>
-            <if test="languageNum != null and languageNum != ''">
-                and language_num = #{languageNum}
+            <if test="doubleSieving.languageNum != null and doubleSieving.languageNum != ''">
+                and language_num = #{doubleSieving.languageNum}
             </if>
-            <if test="socialBehavior != null and socialBehavior != ''">
-                and social_behavior = #{socialBehavior}
+            <if test="doubleSieving.socialBehavior != null and doubleSieving.socialBehavior != ''">
+                and social_behavior = #{doubleSieving.socialBehavior}
             </if>
-            <if test="pediatricHeartScaleAssessMentresults != null and pediatricHeartScaleAssessMentresults != ''">
-                and pediatric_heart_scale_assess_mentresults = #{pediatricHeartScaleAssessMentresults}
+            <if test="doubleSieving.pediatricHeartScaleAssessMentresults != null and doubleSieving.pediatricHeartScaleAssessMentresults != ''">
+                and pediatric_heart_scale_assess_mentresults = #{doubleSieving.pediatricHeartScaleAssessMentresults}
             </if>
-            <if test="coreProjectNum != null and coreProjectNum != ''">
-                and core_project_num = #{coreProjectNum}
+            <if test="doubleSieving.coreProjectNum != null and doubleSieving.coreProjectNum != ''">
+                and core_project_num = #{doubleSieving.coreProjectNum}
             </if>
-            <if test="positivetNum != null and positivetNum != ''">
-                and positivet_num = #{positivetNum}
+            <if test="doubleSieving.positivetNum != null and doubleSieving.positivetNum != ''">
+                and positivet_num = #{doubleSieving.positivetNum}
             </if>
-            <if test="screeningScaleMentresults != null and screeningScaleMentresults != ''">
-                and screening_scale_mentresults = #{screeningScaleMentresults}
+            <if test="doubleSieving.screeningScaleMentresults != null and doubleSieving.screeningScaleMentresults != ''">
+                and screening_scale_mentresults = #{doubleSieving.screeningScaleMentresults}
             </if>
-            <if test="behaviorRatingScaleTotal != null and behaviorRatingScaleTotal != ''">
-                and behavior_rating_scale_total = #{behaviorRatingScaleTotal}
+            <if test="doubleSieving.behaviorRatingScaleTotal != null and doubleSieving.behaviorRatingScaleTotal != ''">
+                and behavior_rating_scale_total = #{doubleSieving.behaviorRatingScaleTotal}
             </if>
-            <if test="feelNum != null and feelNum != ''">
-                and feel_num = #{feelNum}
+            <if test="doubleSieving.feelNum != null and doubleSieving.feelNum != ''">
+                and feel_num = #{doubleSieving.feelNum}
             </if>
-            <if test="socialInteractionNum != null and socialInteractionNum != ''">
-                and social_interaction_num = #{socialInteractionNum}
+            <if test="doubleSieving.socialInteractionNum != null and doubleSieving.socialInteractionNum != ''">
+                and social_interaction_num = #{doubleSieving.socialInteractionNum}
             </if>
-            <if test="bodyMovementNum != null and bodyMovementNum != ''">
-                and body_movement_num = #{bodyMovementNum}
+            <if test="doubleSieving.bodyMovementNum != null and doubleSieving.bodyMovementNum != ''">
+                and body_movement_num = #{doubleSieving.bodyMovementNum}
             </if>
-            <if test="behaviorRatingLanguageNum != null and behaviorRatingLanguageNum != ''">
-                and behavior_rating_language_num = #{behaviorRatingLanguageNum}
+            <if test="doubleSieving.behaviorRatingLanguageNum != null and doubleSieving.behaviorRatingLanguageNum != ''">
+                and behavior_rating_language_num = #{doubleSieving.behaviorRatingLanguageNum}
             </if>
-            <if test="selfCareInDailyLifeNum != null and selfCareInDailyLifeNum != ''">
-                and self_care_in_daily_life_num = #{selfCareInDailyLifeNum}
+            <if test="doubleSieving.selfCareInDailyLifeNum != null and doubleSieving.selfCareInDailyLifeNum != ''">
+                and self_care_in_daily_life_num = #{doubleSieving.selfCareInDailyLifeNum}
             </if>
-            <if test="behaviorRatingScaleAssessMentresults != null and behaviorRatingScaleAssessMentresults != ''">
-                and behavior_rating_scale_assess_mentresults = #{behaviorRatingScaleAssessMentresults}
+            <if test="doubleSieving.behaviorRatingScaleAssessMentresults != null and doubleSieving.behaviorRatingScaleAssessMentresults != ''">
+                and behavior_rating_scale_assess_mentresults = #{doubleSieving.behaviorRatingScaleAssessMentresults}
             </if>
-            <if test="rescreenResults != null and rescreenResults != ''">
-                and rescreen_results = #{rescreenResults}
+            <if test="doubleSieving.rescreenResults != null and doubleSieving.rescreenResults != ''">
+                and rescreen_results = #{doubleSieving.rescreenResults}
             </if>
         </where>
     </select>
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DoubleSievingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DoubleSievingFacade.java
index d56b64d..79add4b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DoubleSievingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DoubleSievingFacade.java
@@ -1,7 +1,7 @@
 package com.lyms.platform.operate.web.facade;
 
-import com.lyms.platform.common.base.PageInfo;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
+import com.lyms.platform.common.dao.BaseQuery;
 import com.lyms.platform.common.enums.EyeCheckMonthEnums;
 import com.lyms.platform.common.enums.SexEnum;
 import com.lyms.platform.common.enums.YnEnums;
@@ -20,8 +20,6 @@ import com.lyms.platform.pojo.BabyModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Component;
 
@@ -142,13 +140,13 @@ public class DoubleSievingFacade extends BaseServiceImpl {
         return br;
     }
 
-    public BaseResponse queryDateListPage(BabyAutismDoubleSieving babyAutismDoubleSieving, PageRequest pageRequest, Integer id) {
-        Page<BabyAutismDoubleSieving> primaryScreeningPage = babyAutismDoubleSievingService.queryByPage(babyAutismDoubleSieving, pageRequest);
+    public BaseResponse queryDateListPage(BabyAutismDoubleSieving babyAutismDoubleSieving, BaseQuery pageRequest, Integer id) {
+        pageRequest.mysqlBuild(babyAutismDoubleSievingService.count(babyAutismDoubleSieving, pageRequest).intValue());
+        List<BabyAutismDoubleSieving> primaryScreeningPage = babyAutismDoubleSievingService.queryByPage(babyAutismDoubleSieving, pageRequest);
         BaseObjectResponse br = new BaseObjectResponse();
         br.setErrorcode(ErrorCodeConstants.SUCCESS);
-        br.setData(primaryScreeningPage.getContent());
-        PageInfo pageInfo = new PageInfo(primaryScreeningPage.getNumber(), primaryScreeningPage.getTotalPages(), Long.valueOf(primaryScreeningPage.getTotalElements()).intValue(), pageRequest.getPageSize());
-        br.setPageInfo(pageInfo);
+        br.setData(primaryScreeningPage);
+        br.setPageInfo(pageRequest.getPageInfo());
         br.setErrormsg("成功");
         return br;
     }