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 36f6634..5da49f4 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 @@ -56,7 +56,13 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS patientCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("username").regex(key), Criteria.where("cardNo").is(key)); residentCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("username").regex(key), Criteria.where("certificateNum").is(key)); } - List patients = mongoTemplate.find(Query.query(patientCriteria), Patients.class); + PageResult mongoPage = findMongoPage(Patients.class, Query.query(patientCriteria), page, limit); + List patients = null; + if(mongoPage.getCount() >= limit) { + patients = (List) mongoPage.getGrid(); + } else { + patients = mongoTemplate.find(Query.query(patientCriteria), Patients.class); + } List residentsArchiveModels = mongoTemplate.find(Query.query(residentCriteria), ResidentsArchiveModel.class); List> restList = new ArrayList<>(); for (Patients patient : patients) { // type: 1=孕期 3=产后 @@ -94,14 +100,14 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("resident", 3); // 妇女建档 temp.put("residentDate", DateUtil.getyyyy_MM_dd(archiveModel.getBuildDay())); // 妇女建档日期 temp.put("check", 2); // 婚检 - temp.put("bookbuild", null); // 孕期建档 1=勾勾 2=叉叉 - temp.put("bookbuildDate", null); + temp.put("bookbuild", 2); // 孕期建档 1=勾勾 2=叉叉 + temp.put("bookbuildDate", "--"); temp.put("yjcount", 0); // 孕检次数 = 初诊 + 复诊 - temp.put("cqsc", 3); // 产前筛查 1=勾勾 2=叉叉 - temp.put("fm", 3); // 分娩 1=勾勾 2=叉叉 - temp.put("fmType", null); // 分娩方式 - temp.put("chfc", 3); // 产后复查 1=勾勾 2=叉叉 - temp.put("chfcCount", null); // 复查次数 + temp.put("cqsc", 2); // 产前筛查 1=勾勾 2=叉叉 + temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 + temp.put("fmType", "--"); // 分娩方式 + temp.put("chfc", 2); // 产后复查 1=勾勾 2=叉叉 + temp.put("chfcCount", 0); // 复查次数 restList.add(temp); } return RespBuilder.buildSuccess(new PageResult(restList.size(), page, limit, CollectionUtils.getPageIds(restList, page, limit)));