diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java
index ebd3b27..ed6ed58 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java
@@ -12,6 +12,7 @@ import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
 import com.lyms.platform.operate.web.service.ITrackDownService;
+import com.lyms.platform.operate.web.utils.CollectionUtils;
 import com.lyms.platform.operate.web.utils.MongoUtil;
 import com.lyms.platform.pojo.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,11 +60,13 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS
             residentCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("username").regex(key), Criteria.where("certificateNum").is(key));
         }
         PageResult mongoPage = findMongoPage(Patients.class, Query.query(patientCriteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit);
-        List<Patients> patients = null;
-        if(mongoPage.getCount() >= limit) {
+        List<Patients> patients = (List<Patients>) mongoPage.getGrid();
+        boolean doPage = false;
+        if(patients.size() >= limit) {
             patients = (List<Patients>) mongoPage.getGrid();
         } else {
             patients = mongoTemplate.find(Query.query(patientCriteria), Patients.class);
+            doPage = true;
         }
         List<ResidentsArchiveModel> residentsArchiveModels = mongoTemplate.find(Query.query(residentCriteria), ResidentsArchiveModel.class);
         List<Map<String, Object>> restList = new ArrayList<>();
@@ -146,7 +149,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS
                 restList.addAll(archiveModelList.subList(0, count));
             }
         }
-        return RespBuilder.buildSuccess("tabList", new PageResult(mongoPage.getCount() + archiveModelCount, page, limit, restList));
+        return RespBuilder.buildSuccess("tabList", new PageResult(mongoPage.getCount() + archiveModelCount, page, limit, doPage ? CollectionUtils.getPageIds(restList, page, limit) : restList));
     }
 
     private int isExitTrackDown(String parentId, TrackDownDateEnums trackDownDateEnums) {
@@ -235,8 +238,11 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS
                 temp.put("residenceAddress", mongoUtil.findAddressName(residentsArchiveModel.getProvinceId(), residentsArchiveModel.getCityId(), residentsArchiveModel.getAreaId(), residentsArchiveModel.getStreetId())); /** 居住地 */
                 temp.put("phone", StringUtils.encryPhone(residentsArchiveModel.getPhone()));
                 TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("residentsArchiveId").is(residentsArchiveModel.getId()).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
+                // 婚检追访结果
                 temp.put("end", trackDown == null ? "--" : TrackDownTransferEnums.getName(trackDown.getTrackDownType()));
+                // 婚检追访时间
                 temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate()));
+                // 预约时间
                 temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate()));
                 restList.add(temp);
             }