jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 638d3065ab9e79e620e5534f64fdf9627736e326

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

听力诊断管理列表分页bug修改

Showing 1 changed file with 15 additions and 14 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java View file @ 638d306
... ... @@ -501,6 +501,7 @@
501 501 query.setHospitalId(hospitalId);
502 502 query.setSort("diagnose_time desc");
503 503  
  504 +
504 505 //已经诊断的数据
505 506 List<BabyPatientExtendEarHearingDiagnose> hearingDiagnoseList = hearingDiagnoseService.getHdAndScreen(query);
506 507  
507 508  
508 509  
509 510  
510 511  
511 512  
512 513  
513 514  
514 515  
515 516  
516 517  
517 518  
518 519  
519 520  
... ... @@ -639,48 +640,48 @@
639 640 List<HearingDiagnoseListResult> resList = new ArrayList<>();
640 641 if (hdReq.getEnalble() != null) {
641 642 if (hdReq.getEnalble() == 1) {
642   - for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); (i < confiList.size() && i < hdReq.getLimit()); i++) {
  643 + for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) {
643 644 resList.add(confiList.get(i));
644 645 }
645   - result.setData(confiList);
  646 + result.setData(resList);
646 647 pageInfo.setCount(confiList.size());
647 648 } else if (hdReq.getEnalble() == 2) {
648   - for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); (i < waitConfiList.size() && i < hdReq.getLimit()); i++) {
  649 + for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) {
649 650 resList.add(waitConfiList.get(i));
650 651 }
651 652 pageInfo.setCount(waitConfiList.size());
652   - result.setData(waitConfiList);
  653 + result.setData(resList);
653 654 } else if (hdReq.getEnalble() == 3) {
654   - for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); (i < hdrList.size() && i < hdReq.getLimit()); i++) {
  655 + for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) {
655 656 resList.add(hdrList.get(i));
656 657 }
657 658 pageInfo.setCount(hdrList.size());
658   - result.setData(hdrList);
  659 + result.setData(resList);
659 660 }
660 661 } else if (hdReq.getIsconfirm() != null) {
661   - for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); (i < confiList.size() && i < hdReq.getLimit()); i++) {
  662 + for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) {
662 663 resList.add(confiList.get(i));
663 664 }
664   - result.setData(confiList);
  665 + result.setData(resList);
665 666 pageInfo.setCount(confiList.size());
666 667 } else if(hdReq.getConfirmDegree()!=null){
667   - for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); (i < confiList.size() && i < hdReq.getLimit()); i++) {
  668 + for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) {
668 669 resList.add(confiList.get(i));
669 670 }
670   - result.setData(confiList);
  671 + result.setData(resList);
671 672 pageInfo.setCount(confiList.size());
672 673 }else if(StringUtils.isNotEmpty(hdReq.getDiagnDoctorId())){
673   - for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); (i < confiList.size() && i < hdReq.getLimit()); i++) {
  674 + for (int i = (hdReq.getPage() - 1) * hdReq.getLimit();i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) {
674 675 resList.add(confiList.get(i));
675 676 }
676   - result.setData(confiList);
  677 + result.setData(resList);
677 678 pageInfo.setCount(confiList.size());
678 679 }else {
679   - for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); (i < hdrList.size() && i < hdReq.getLimit()); i++) {
  680 + for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) {
680 681 resList.add(hdrList.get(i));
681 682 }
682 683 pageInfo.setCount(hdrList.size());
683   - result.setData(hdrList);
  684 + result.setData(resList);
684 685 }
685 686  
686 687 pageInfo.setLimit(hdReq.getLimit());