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 4f97ce5..4324e73 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 @@ -355,6 +355,7 @@ public class FollowUpController extends BaseController { query.setNeed("1"); query.setSort("follow_time desc"); 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 6f0ffbb..f47fa25 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 @@ -431,6 +431,7 @@ public class HearDiagnManageController extends BaseController { query.setNeed("1"); query.setLimit(hdReq.getLimit()); query.setOffset((hdReq.getPage()-1)*hdReq.getLimit()); + query.setPage(hdReq.getPage()); List hearingDiagnoseList = hearingDiagnoseService.getHdAndScreen(query); @@ -647,7 +648,7 @@ public class HearDiagnManageController extends BaseController { BaseListResponse result = new BaseListResponse(); PageInfo pageInfo = new PageInfo(); if (model.getStatus() == null) { - for (int i = (model.getPage() - 1) * model.getLimit(); (i < hearDiagnManageListResults.size() && i < model.getLimit()); i++) { + for (int i = (model.getPage() - 1) * model.getLimit(); i < hearDiagnManageListResults.size() && i < model.getPage()*model.getLimit(); i++) { hdmResult.add(hearDiagnManageListResults.get(i)); } pageInfo.setCount(hearDiagnManageListResults.size()); @@ -655,19 +656,19 @@ public class HearDiagnManageController extends BaseController { } else { // 1-已诊断、2-待诊断 if (model.getStatus() == 1) { - for (int i = (model.getPage() - 1) * model.getLimit(); (i < alrScreens.size() && i < model.getLimit()); i++) { + for (int i = (model.getPage() - 1) * model.getLimit(); i < alrScreens.size() && i < model.getPage()*model.getLimit(); i++) { hdmResult.add(alrScreens.get(i)); } pageInfo.setCount(alrScreens.size()); result.setData(hdmResult); } else if (model.getStatus() == 2) { - for (int i = (model.getPage() - 1) * model.getLimit(); (i < notScreens.size() && i < model.getLimit()); i++) { + for (int i = (model.getPage() - 1) * model.getLimit(); i < notScreens.size() && i < model.getPage()*model.getLimit(); i++) { hdmResult.add(notScreens.get(i)); } pageInfo.setCount(notScreens.size()); result.setData(hdmResult); } else { - for (int i = (model.getPage() - 1) * model.getLimit(); (i < hearDiagnManageListResults.size() && i < model.getLimit()); i++) { + for (int i = (model.getPage() - 1) * model.getLimit(); i < hearDiagnManageListResults.size() && i < model.getPage()*model.getLimit(); i++) { hdmResult.add(hearDiagnManageListResults.get(i)); } pageInfo.setCount(hearDiagnManageListResults.size());