diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyPatientExtendEarScreenMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyPatientExtendEarScreenMapper.java
index aa5f920..8574c39 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyPatientExtendEarScreenMapper.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyPatientExtendEarScreenMapper.java
@@ -25,4 +25,5 @@ public interface BabyPatientExtendEarScreenMapper {
     public List<BabyPatientExtendEarScreen> dubiousScreen(BabyPatientExtendEarScreenQuery screenQuery);
 
     List<BabyPatientExtendEarScreen> queryEarScreenList(BabyPatientExtendEarScreenQuery screenQuery);
+    int queryEarScreenListCount(BabyPatientExtendEarScreenQuery screenQuery);
 }
\ No newline at end of file
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarScreenServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarScreenServiceImpl.java
index 6a17965..67931ed 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarScreenServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarScreenServiceImpl.java
@@ -60,6 +60,9 @@ public class BabyPatientExtendEarScreenServiceImpl implements BabyPatientExtendE
 
     @Override
     public List<BabyPatientExtendEarScreen> queryEarScreenList(BabyPatientExtendEarScreenQuery screenQuery) {
+        if (screenQuery.getNeed() != null) {
+            screenQuery.mysqlBuild(babyPatientExtendEarScreenMapper.queryEarScreenListCount(screenQuery));
+        }
         return babyPatientExtendEarScreenMapper.queryEarScreenList(screenQuery);
     }
 
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml
index 7647895..91a831b 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml
@@ -109,7 +109,7 @@ select id,name,sex,cardNo,birth,mname,mcert_type_id,mcert_no,mphone,vc_card_no,b
 
     <sql id="orderAndLimit">
         <if test="sort != null and sort != '' ">
-            order by ${sort}
+            order by ${sort} desc
             <if test="need != null">
                 limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER}
             </if>
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml
index c8eb6be..f1365d8 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml
@@ -149,7 +149,7 @@ select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,foll
 
     <sql id="orderAndLimit">
         <if test="sort != null and sort != '' ">
-            order by ${sort}
+            order by ${sort} desc
             <if test="need != null">
                 limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER}
             </if>
@@ -309,7 +309,7 @@ select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,foll
                 </foreach>
             </if>
             and ifdel = 0
-            order by follow_time
+            order by follow_time desc
         </where>
     </select>
 </mapper>
\ No newline at end of file
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml
index 19bfc53..6dea91e 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml
@@ -451,7 +451,7 @@ select id,baby_id,hospital_id,diagnose_time,high_factor,abr_left_dbnhl,abr_left_
 
     <sql id="orderAndLimit">
         <if test="sort != null and sort != '' ">
-            order by ${sort}
+            order by ${sort} desc
             <if test="need != null">
                 limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER}
             </if>
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml
index 814b219..7eb836d 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml
@@ -169,7 +169,7 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_
 
     <sql id="orderAndLimit">
         <if test="sort != null and sort != '' ">
-            order by ${sort}
+            order by ${sort} desc
             <if test="need != null">
                 limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER}
             </if>
@@ -455,6 +455,161 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_
                 and status = #{status,jdbcType=INTEGER}
             </if>
         </where>
+        <include refid="orderAndLimit"/>
+    </select>
+
+
+    <select id="queryEarScreenListCount" resultType="int"
+            parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarScreenQuery">
+        select count(1) from baby_patient_extend_ear_screen
+        <where>
+            status = 0
+            <if test="srcStartTime!=null">
+                AND
+                <![CDATA[
+                DATEDIFF(#{srcStartTime},screen_date) <=0
+                ]]>
+            </if>
+            <if test="srcEndTime!=null">
+                and
+                <![CDATA[
+                DATEDIFF(#{srcEndTime},screen_date) >=0
+                ]]>
+            </if>
+
+            <if test="screenType!=null and screenType >=0">
+                and screen_type = #{screenType}
+            </if>
+
+            <if test="checkDoctorId!=null and checkDoctorId != ''">
+                and check_doctor_id = #{checkDoctorId}
+            </if>
+            <if test="pid!=null and pid != ''">
+                and pid = #{pid}
+            </if>
+
+            <if test="checkHospitalIds != null ">
+                and check_hospital_id in
+                <foreach item="item" index="index" collection="checkHospitalIds" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="checkHospitalId != null and checkHospitalId != ''">
+                and check_hospital_id = #{checkHospitalId,jdbcType=VARCHAR}
+            </if>
+
+            <if test="babyIds!=null">
+                and baby_id in (
+                <foreach item="babyId" collection="babyIds" separator=",">
+                    #{babyId}
+                </foreach>
+                )
+            </if>
+
+            <if test="scrIspass != null and srcSkill==null and leftRight == null">
+                and scr_ispass = #{scrIspass,jdbcType=INTEGER}
+            </if>
+            <if test="srcSkill != null and srcSkill == 1">
+                <if test="scrIspass != null and scrIspass ==1">
+                    and(
+                    oae_left =1
+                    and oae_right = 1
+                    )
+                </if>
+                <if test="scrIspass != null and scrIspass ==2">
+                    and(
+                    oae_left =-1
+                    and oae_right = -1
+                    )
+                </if>
+                <if test="scrIspass == null">
+                    and(
+                    oae_left is not null
+                    or oae_right is not null
+                    )
+                </if>
+            </if>
+            <if test="srcSkill != null and srcSkill == 2">
+                <if test="scrIspass != null and scrIspass ==1">
+                    and(
+                    aabr_left =1
+                    and aabr_right = 1
+                    )
+                </if>
+                <if test="scrIspass != null and scrIspass ==2">
+                    and(
+                    aabr_left =-1
+                    and aabr_right = -1
+                    )
+                </if>
+                <if test="scrIspass == null">
+                    and(
+                    aabr_left is not null
+                    or aabr_right is not null
+                    )
+                </if>
+
+            </if>
+
+            <if test="leftRight!= null and leftRight == 1">
+                <if test="scrIspass != null and scrIspass ==1">
+                    and(
+                    oae_left =1
+                    and aabr_left = 1
+                    )
+                </if>
+                <if test="scrIspass != null and scrIspass ==2">
+                    and(
+                    oae_left =-1
+                    and aabr_left = -1
+                    )
+                </if>
+                <if test="scrIspass == null">
+                    and(
+                    oae_left is not null
+                    or aabr_left is not null
+                    )
+                </if>
+            </if>
+
+            <if test="leftRight!= null and leftRight == 2">
+                <if test="scrIspass != null and scrIspass ==1">
+                    and(
+                    oae_right =1
+                    and aabr_right = 1
+                    )
+                </if>
+                <if test="scrIspass != null and scrIspass ==2">
+                    and(
+                    oae_right =-1
+                    and aabr_right = -1
+                    )
+                </if>
+                <if test="scrIspass == null">
+                    and(
+                    oae_right is not null
+                    or aabr_right is not null
+                    )
+                </if>
+
+            </if>
+
+            <if test="nextStartTime!=null">
+                AND
+                <![CDATA[
+                DATEDIFF(#{nextStartTime},next_check_time) <=0
+                ]]>
+            </if>
+            <if test="nextEndTime!=null">
+                and
+                <![CDATA[
+                DATEDIFF(#{nextEndTime},next_check_time) >=0
+                ]]>
+            </if>
+            <if test="status != null and status >= 0">
+                and status = #{status,jdbcType=INTEGER}
+            </if>
+        </where>
     </select>
 
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java
index d042dd1..985644a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java
@@ -1,14 +1,9 @@
 package com.lyms.platform.operate.web;
 
-import com.aspose.words.Document;
-import com.aspose.words.License;
+import net.sourceforge.pinyin4j.PinyinHelper;
 import org.apache.log4j.Logger;
-import org.apache.log4j.PropertyConfigurator;
 
-import java.io.File;
-import java.io.InputStream;
-import java.net.URL;
-import java.text.DecimalFormat;
+import java.util.*;
 
 /**
  * Created by Administrator on 2016/8/22 0022.
@@ -18,5 +13,52 @@ public class Test {
     private static org.apache.log4j.Logger log = Logger.getLogger("HTTP-INVOKE");
 
     public static void main(String[] args) throws Exception{
+        String[] arr={ "王二六","张三", "李四", "王五","赵六", "JAVA", "123","怡情"};
+        List<String> names = new ArrayList<>();
+        names.add("张明");
+        names.add("叶山");
+        names.add("静香");
+        names.add("恺呢");
+        names.add("黄渤");
+        names.add("李全域");
+        names.add("向恒刚");
+        names.add("阿明");
+        names.add("落叶");
+        names.add("王平");
+        Arrays.sort(arr,new ComparatorPinYin());
+        for (String string : arr) {
+            // System.out.println(string);
+        }
+        Collections.sort(names,new ComparatorPinYin());
+        for (String string : names) {
+            System.out.println(string);
+        }
+    }
+    /**
+     * 功能：实现汉语拼音序比较
+     *
+     */
+    static  class ComparatorPinYin implements Comparator<String> {
+        @Override
+        public int compare(String o1, String o2) {
+            return ToPinYinString(o1).compareTo(ToPinYinString(o2));
+        }
+
+        private String ToPinYinString(String str){
+
+            StringBuilder sb=new StringBuilder();
+            String[] arr=null;
+
+            for(int i=0;i<str.length();i++){
+                arr= PinyinHelper.toHanyuPinyinStringArray(str.charAt(i));
+                if(arr!=null && arr.length>0){
+                    for (String string : arr) {
+                        sb.append(string);
+                    }
+                }
+            }
+
+            return sb.toString();
+        }
     }
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java
index d078010..6763cf6 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java
@@ -353,9 +353,9 @@ public class FollowUpController extends BaseController {
         query.setHospitalId(hospitalId);
         //分页信息
         query.setNeed("1");
-        query.setSort("create_time");
+        query.setSort("follow_time");
         query.setLimit(fur.getLimit());
-        query.setPage(fur.getPage());
+        query.setOffset((fur.getPage()-1)*fur.getLimit());
         if (CollectionUtils.isNotEmpty(pids)) {
             query.setPids((String[]) pids.toArray(new String[pids.size()]));
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java
index ee0ec98..f36dcc7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java
@@ -429,6 +429,9 @@ public class HearDiagnManageController extends BaseController {
         }
         query.setSort("diagnose_time");
         query.setNeed("1");
+        query.setLimit(hdReq.getLimit());
+        query.setOffset((hdReq.getPage()-1)*hdReq.getLimit());
+
         List<BabyPatientExtendEarHearingDiagnose> hearingDiagnoseList = hearingDiagnoseService.getHdAndScreen(query);
 
         List<HearingDiagnoseListResult> hdList = new ArrayList<>();
@@ -500,12 +503,12 @@ public class HearDiagnManageController extends BaseController {
         }
         BaseListResponse result = new BaseListResponse();
         result.setData(hdList);
-        PageInfo pageInfo = new PageInfo();
-        pageInfo.setLimit(hdReq.getLimit());
-        pageInfo.setPage(hdReq.getPage());
-        pageInfo.setCount(query.getCount());
+        // PageInfo pageInfo = new PageInfo();
+        // pageInfo.setLimit(hdReq.getLimit());
+        // pageInfo.setPage(hdReq.getPage());
+        // pageInfo.setCount(query.getCount());
 
-        result.setPageInfo(pageInfo);
+        result.setPageInfo(query.getPageInfo());
         return result;
     }
 
@@ -1141,7 +1144,9 @@ public class HearDiagnManageController extends BaseController {
 
         babyQuery.setHospitalId(hospitalId);
         babyQuery.setNoEnable("0");
-
+        babyQuery.setNeed("y");
+        babyQuery.setOffset((model.getPage()-1)*model.getLimit());
+        babyQuery.setLimit(model.getLimit());
         List<String> babyIds = new ArrayList<>();
 
         //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id
@@ -1209,6 +1214,7 @@ public class HearDiagnManageController extends BaseController {
                 hdm.setMonthAge(DateUtil.getBabyMonthAge(ear.getBirth(), new Date()));
                 hdm.setBirthday(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(ear.getBirth())));
                 hdm.setSex(com.lyms.platform.common.utils.StringUtils.emptyDeal(SexEnum.getTextById(ear.getSex())));
+
                 BabyPatientExtendEarScreen es = screenMap.get(ear.getBabyPatientId());
 
                 if (es == null) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
index eea71e6..e729ad9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
@@ -6,7 +6,6 @@ import com.lyms.platform.biz.service.BabyService;
 import com.lyms.platform.biz.service.BasicConfigService;
 import com.lyms.platform.biz.service.PersonService;
 import com.lyms.platform.common.base.IBasicRequestConvert;
-import com.lyms.platform.common.base.PageInfo;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.enums.*;
 import com.lyms.platform.common.result.BaseListResponse;
@@ -1813,6 +1812,10 @@ public class BabyEarFacade {
         String hospitalId = autoMatchFacade.getHospitalId(userId);
         screenQuery.setCheckHospitalId(hospitalId);
         screenQuery.setStatus(0);
+        screenQuery.setSort("screen_date");
+        screenQuery.setNeed("y");
+        screenQuery.setOffset((earScreenListRequest.getPage()-1)*earScreenListRequest.getLimit());
+        screenQuery.setLimit(earScreenListRequest.getLimit());
 
         //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id
         if (StringUtils.isNotEmpty(earScreenListRequest.getKeyWord()) || earScreenListRequest.getBirthStartTime() != null || earScreenListRequest.getBirthEndTime() != null) {//关键字：姓名、联系方式、就诊卡 查询babyId
@@ -1885,12 +1888,12 @@ public class BabyEarFacade {
         BaseListResponse baseResponse = new BaseListResponse();
         baseResponse.setObject(earScreenResults);
         baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
-        PageInfo pageInfo = new PageInfo();
-        pageInfo.setCount(earScreenResults.size());
-        pageInfo.setLimit(earScreenListRequest.getLimit());
-        pageInfo.setPage(earScreenListRequest.getPage());
-        pageInfo.setSize(earScreenResults.size());
-        baseResponse.setPageInfo(pageInfo);
+        // PageInfo pageInfo = new PageInfo();
+        // pageInfo.setCount(earScreenResults.size());
+        // pageInfo.setLimit(earScreenListRequest.getLimit());
+        // pageInfo.setPage(earScreenListRequest.getPage());
+        // pageInfo.setSize(earScreenResults.size());
+        baseResponse.setPageInfo(screenQuery.getPageInfo());
         baseResponse.setErrormsg("成功");
         return baseResponse;
     }