jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 6ef18c5e0db81a0d884ab2f238a5854799a161c8

Authored by yangfei
1 parent 638d3065ab
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

确诊儿童、听力可疑儿童分页bug修改

Showing 2 changed files with 6 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java View file @ 6ef18c5
... ... @@ -355,6 +355,7 @@
355 355 query.setNeed("1");
356 356 query.setSort("follow_time desc");
357 357 query.setLimit(fur.getLimit());
  358 + query.setPage(fur.getPage());
358 359 query.setOffset((fur.getPage()-1)*fur.getLimit());
359 360 if (CollectionUtils.isNotEmpty(pids)) {
360 361 query.setPids((String[]) pids.toArray(new String[pids.size()]));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java View file @ 6ef18c5
... ... @@ -431,6 +431,7 @@
431 431 query.setNeed("1");
432 432 query.setLimit(hdReq.getLimit());
433 433 query.setOffset((hdReq.getPage()-1)*hdReq.getLimit());
  434 + query.setPage(hdReq.getPage());
434 435  
435 436 List<BabyPatientExtendEarHearingDiagnose> hearingDiagnoseList = hearingDiagnoseService.getHdAndScreen(query);
436 437  
... ... @@ -647,7 +648,7 @@
647 648 BaseListResponse result = new BaseListResponse();
648 649 PageInfo pageInfo = new PageInfo();
649 650 if (model.getStatus() == null) {
650   - for (int i = (model.getPage() - 1) * model.getLimit(); (i < hearDiagnManageListResults.size() && i < model.getLimit()); i++) {
  651 + for (int i = (model.getPage() - 1) * model.getLimit(); i < hearDiagnManageListResults.size() && i < model.getPage()*model.getLimit(); i++) {
651 652 hdmResult.add(hearDiagnManageListResults.get(i));
652 653 }
653 654 pageInfo.setCount(hearDiagnManageListResults.size());
654 655  
655 656  
... ... @@ -655,19 +656,19 @@
655 656 } else {
656 657 // 1-已诊断、2-待诊断
657 658 if (model.getStatus() == 1) {
658   - for (int i = (model.getPage() - 1) * model.getLimit(); (i < alrScreens.size() && i < model.getLimit()); i++) {
  659 + for (int i = (model.getPage() - 1) * model.getLimit(); i < alrScreens.size() && i < model.getPage()*model.getLimit(); i++) {
659 660 hdmResult.add(alrScreens.get(i));
660 661 }
661 662 pageInfo.setCount(alrScreens.size());
662 663 result.setData(hdmResult);
663 664 } else if (model.getStatus() == 2) {
664   - for (int i = (model.getPage() - 1) * model.getLimit(); (i < notScreens.size() && i < model.getLimit()); i++) {
  665 + for (int i = (model.getPage() - 1) * model.getLimit(); i < notScreens.size() && i < model.getPage()*model.getLimit(); i++) {
665 666 hdmResult.add(notScreens.get(i));
666 667 }
667 668 pageInfo.setCount(notScreens.size());
668 669 result.setData(hdmResult);
669 670 } else {
670   - for (int i = (model.getPage() - 1) * model.getLimit(); (i < hearDiagnManageListResults.size() && i < model.getLimit()); i++) {
  671 + for (int i = (model.getPage() - 1) * model.getLimit(); i < hearDiagnManageListResults.size() && i < model.getPage()*model.getLimit(); i++) {
671 672 hdmResult.add(hearDiagnManageListResults.get(i));
672 673 }
673 674 pageInfo.setCount(hearDiagnManageListResults.size());