diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyAutismPrimaryScreeningService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyAutismPrimaryScreeningService.java
index 621b680..8157ba5 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyAutismPrimaryScreeningService.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyAutismPrimaryScreeningService.java
@@ -61,4 +61,5 @@ public interface BabyAutismPrimaryScreeningService {
      */
     List<BabyAutismPrimaryScreening> queryListByBabyId(String babyId);
 
+    Long count(BabyAutismPrimaryScreening babyAutismPrimaryScreening, BaseQuery pageRequest);
 }
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyAutismPrimaryScreeningServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyAutismPrimaryScreeningServiceImpl.java
index 079f179..f110962 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyAutismPrimaryScreeningServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyAutismPrimaryScreeningServiceImpl.java
@@ -40,7 +40,6 @@ public class BabyAutismPrimaryScreeningServiceImpl implements BabyAutismPrimaryS
      */
     @Override
     public List<BabyAutismPrimaryScreening> queryByPage(BabyAutismPrimaryScreening babyAutismPrimaryScreening, BaseQuery pageRequest) {
-        long total = this.babyAutismPrimaryScreeningDao.count(babyAutismPrimaryScreening);
         return this.babyAutismPrimaryScreeningDao.queryAllByLimit(babyAutismPrimaryScreening, pageRequest);
     }
 
@@ -89,4 +88,9 @@ public class BabyAutismPrimaryScreeningServiceImpl implements BabyAutismPrimaryS
     public List<BabyAutismPrimaryScreening> queryListByBabyId(String babyId) {
         return babyAutismPrimaryScreeningDao.queryListByBabyId(babyId);
     }
+
+    @Override
+    public Long count(BabyAutismPrimaryScreening babyAutismPrimaryScreening, BaseQuery pageRequest) {
+        return this.babyAutismPrimaryScreeningDao.count(babyAutismPrimaryScreening);
+    }
 }
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml
index db05cb0..99a52fa 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml
@@ -274,30 +274,30 @@
     </select>
 
     <!--新增所有列-->
-    <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into baby_autism_primary_screening(created, modified, yn, operater_id, hospital_id, baby_id,
+    <insert id="insert" >
+        insert into baby_autism_primary_screening(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, guidance_opinions,
                                                   handle_opinions, warning_signs, language_social,
                                                   preliminary_screening_results)
-        values (#{created}, #{modified}, #{yn}, #{operaterId}, #{hospitalId}, #{babyId}, #{babyBuildDate}, #{babyName},
+        values (#{id},#{created}, #{modified}, #{yn}, #{operaterId}, #{hospitalId}, #{babyId}, #{babyBuildDate}, #{babyName},
                 #{babySex}, #{babyMName}, #{babyFName}, #{babyMPhone}, #{babyFPhone}, #{babyMCertNo}, #{babyFCertNo},
                 #{pid}, #{checkMonthAge}, #{checkMonthId}, #{birth}, #{checkTime}, #{nextCheckTime}, #{doctor},
                 #{doctorSign}, #{patientSign}, #{guidanceOpinions}, #{handleOpinions}, #{entity.warningSignstring},
                 #{entity.languageSocialstirng}, #{entity.global})
     </insert>
 
-    <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into baby_autism_primary_screening(created, modified, yn, operater_id, hospital_id, baby_id,
+    <insert id="insertBatch" >
+        insert into baby_autism_primary_screening(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, guidance_opinions, handle_opinions, warning_signs, language_social,
         preliminary_screening_results)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.created}, #{entity.modified}, #{entity.yn}, #{entity.operaterId}, #{entity.hospitalId},
+            (#{entity.id},#{entity.created}, #{entity.modified}, #{entity.yn}, #{entity.operaterId}, #{entity.hospitalId},
             #{entity.babyId}, #{entity.babyBuildDate}, #{entity.babyName}, #{entity.babySex}, #{entity.babyMName},
             #{entity.babyFName}, #{entity.babyMPhone}, #{entity.babyFPhone}, #{entity.babyMCertNo},
             #{entity.babyFCertNo}, #{entity.pid}, #{entity.checkMonthAge}, #{entity.checkMonthId}, #{entity.birth},
@@ -307,15 +307,15 @@
         </foreach>
     </insert>
 
-    <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into baby_autism_primary_screening(created, modified, yn, operater_id, hospital_id, baby_id,
+    <insert id="insertOrUpdateBatch" >
+        insert into baby_autism_primary_screening(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, guidance_opinions, handle_opinions, warning_signs, language_social,
         preliminary_screening_results)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.created}, #{entity.modified}, #{entity.yn}, #{entity.operaterId}, #{entity.hospitalId},
+            (#{entity.id},#{entity.created}, #{entity.modified}, #{entity.yn}, #{entity.operaterId}, #{entity.hospitalId},
             #{entity.babyId}, #{entity.babyBuildDate}, #{entity.babyName}, #{entity.babySex}, #{entity.babyMName},
             #{entity.babyFName}, #{entity.babyMPhone}, #{entity.babyFPhone}, #{entity.babyMCertNo},
             #{entity.babyFCertNo}, #{entity.pid}, #{entity.checkMonthAge}, #{entity.checkMonthId}, #{entity.birth},
@@ -359,10 +359,10 @@
     <update id="update">
         update baby_autism_primary_screening
         <set>
-            <if test="created != null and created != ''">
+            <if test="created != null">
                 created = #{created},
             </if>
-            <if test="modified != null and modified != ''">
+            <if test="modified != null">
                 modified = #{modified},
             </if>
             <if test="yn != null">
@@ -377,7 +377,7 @@
             <if test="babyId != null and babyId != ''">
                 baby_id = #{babyId},
             </if>
-            <if test="babyBuildDate != null and babyBuildDate != ''">
+            <if test="babyBuildDate != null">
                 baby_build_date = #{babyBuildDate},
             </if>
             <if test="babyName != null and babyName != ''">
@@ -413,13 +413,13 @@
             <if test="checkMonthId != null and checkMonthId != ''">
                 check_month_id = #{checkMonthId},
             </if>
-            <if test="birth != null and birth != ''">
+            <if test="birth != null">
                 birth = #{birth},
             </if>
-            <if test="checkTime != null and checkTime != ''">
+            <if test="checkTime != null">
                 check_time = #{checkTime},
             </if>
-            <if test="nextCheckTime != null and nextCheckTime != ''">
+            <if test="nextCheckTime != null">
                 next_check_time = #{nextCheckTime},
             </if>
             <if test="doctor != null and doctor != ''">
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PrimaryScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PrimaryScreeningFacade.java
index 8665f63..bc45609 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PrimaryScreeningFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PrimaryScreeningFacade.java
@@ -158,6 +158,7 @@ public class PrimaryScreeningFacade extends BaseServiceImpl {
     }
 
     public BaseResponse queryDateListPage(BabyAutismPrimaryScreening babyAutismPrimaryScreening, BaseQuery pageRequest, Integer id) {
+        pageRequest.mysqlBuild(babyAutismPrimaryScreeningService.count(babyAutismPrimaryScreening, pageRequest).intValue());
         List<BabyAutismPrimaryScreening> primaryScreeningPage = babyAutismPrimaryScreeningService.queryByPage(babyAutismPrimaryScreening, pageRequest);
         for (BabyAutismPrimaryScreening primaryScreening : primaryScreeningPage) {
             //查询医院