From d986745e3df78c711c990a9db871308959f7baba Mon Sep 17 00:00:00 2001 From: "[wangbo]" Date: Sat, 13 Jul 2019 10:54:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E5=90=8E=E5=A4=8D?= =?UTF-8?q?=E6=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/facade/TrackDownFacade.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index 9d2cdf5..0129b22 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -402,6 +402,7 @@ public class TrackDownFacade { List pids = new ArrayList<>(); for (Patients ps : patientses) { pids.add(ps.getId()); + System.out.println(ps.getId()); } downRecordQuery.setParentIds(pids); } @@ -621,12 +622,15 @@ public class TrackDownFacade { public BaseObjectResponse list(TrackDownQueryRequest downQueryRequest, Integer userId) { //转换为本地的查询条件 TrackDownRecordQuery downRecordQuery; + PageResult pageResult = new PageResult(); try { downRecordQuery = convertNaviteQuery(downQueryRequest, userId); } catch (Exception e) { - BaseObjectResponse baseObjectResponse = new BaseObjectResponse(); - baseObjectResponse.setData(new ArrayList<>()); - return new BaseObjectResponse(); + pageResult.setCount(0); + pageResult.setPage(downQueryRequest.getPage()); + pageResult.setLimit(downQueryRequest.getLimit()); + pageResult.setGrid(new ArrayList<>()); + return RespBuilder.buildSuccess(pageResult); } List downRecordList = trackDownRecordService.queryTrackDown(downRecordQuery); List data = new ArrayList<>(); @@ -657,7 +661,7 @@ public class TrackDownFacade { data.add(map); } } - PageResult pageResult = new PageResult(); + pageResult.setCount(downRecordQuery.getPageInfo().getCount()); pageResult.setPage(downRecordQuery.getPageInfo().getPage()); pageResult.setLimit(downRecordQuery.getPageInfo().getLimit()); -- 1.8.3.1