From 638d3065ab9e79e620e5534f64fdf9627736e326 Mon Sep 17 00:00:00 2001 From: yangfei Date: Mon, 30 Oct 2017 17:28:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E5=8A=9B=E8=AF=8A=E6=96=AD=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=88=97=E8=A1=A8=E5=88=86=E9=A1=B5bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/HearingDiagnoseController.java | 29 +++++++++++----------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java index 5f46184..6040726 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java @@ -501,6 +501,7 @@ public class HearingDiagnoseController extends BaseController { query.setHospitalId(hospitalId); query.setSort("diagnose_time desc"); + //已经诊断的数据 List hearingDiagnoseList = hearingDiagnoseService.getHdAndScreen(query); @@ -639,48 +640,48 @@ public class HearingDiagnoseController extends BaseController { List resList = new ArrayList<>(); if (hdReq.getEnalble() != null) { if (hdReq.getEnalble() == 1) { - for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); (i < confiList.size() && i < hdReq.getLimit()); i++) { + for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) { resList.add(confiList.get(i)); } - result.setData(confiList); + result.setData(resList); pageInfo.setCount(confiList.size()); } else if (hdReq.getEnalble() == 2) { - for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); (i < waitConfiList.size() && i < hdReq.getLimit()); i++) { + for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) { resList.add(waitConfiList.get(i)); } pageInfo.setCount(waitConfiList.size()); - result.setData(waitConfiList); + result.setData(resList); } else if (hdReq.getEnalble() == 3) { - for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); (i < hdrList.size() && i < hdReq.getLimit()); i++) { + for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) { resList.add(hdrList.get(i)); } pageInfo.setCount(hdrList.size()); - result.setData(hdrList); + result.setData(resList); } } else if (hdReq.getIsconfirm() != null) { - for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); (i < confiList.size() && i < hdReq.getLimit()); i++) { + for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) { resList.add(confiList.get(i)); } - result.setData(confiList); + result.setData(resList); pageInfo.setCount(confiList.size()); } else if(hdReq.getConfirmDegree()!=null){ - for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); (i < confiList.size() && i < hdReq.getLimit()); i++) { + for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) { resList.add(confiList.get(i)); } - result.setData(confiList); + result.setData(resList); pageInfo.setCount(confiList.size()); }else if(StringUtils.isNotEmpty(hdReq.getDiagnDoctorId())){ - for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); (i < confiList.size() && i < hdReq.getLimit()); i++) { + for (int i = (hdReq.getPage() - 1) * hdReq.getLimit();i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) { resList.add(confiList.get(i)); } - result.setData(confiList); + result.setData(resList); pageInfo.setCount(confiList.size()); }else { - for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); (i < hdrList.size() && i < hdReq.getLimit()); i++) { + for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) { resList.add(hdrList.get(i)); } pageInfo.setCount(hdrList.size()); - result.setData(hdrList); + result.setData(resList); } pageInfo.setLimit(hdReq.getLimit()); -- 1.8.3.1