From 6ef18c5e0db81a0d884ab2f238a5854799a161c8 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Mon, 30 Oct 2017 17:37:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E8=AF=8A=E5=84=BF=E7=AB=A5=E3=80=81?=
 =?UTF-8?q?=E5=90=AC=E5=8A=9B=E5=8F=AF=E7=96=91=E5=84=BF=E7=AB=A5=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/controller/FollowUpController.java | 1 +
 .../operate/web/controller/HearDiagnManageController.java        | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

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<BabyPatientExtendEarHearingDiagnose> 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());
-- 
1.8.3.1