From 62e2651937bd431739caeefdf6a49772ed966d17 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 24 Aug 2018 16:54:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E6=9B=BE=E9=AB=98=E5=8D=B1=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/biz/service/AntExRecordService.java | 10 ---------- .../lyms/platform/operate/web/facade/AntExRecordFacade.java | 9 +++++++-- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java index ad281ca..c430322 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java @@ -356,16 +356,6 @@ public class AntExRecordService { return antExRecordDao.queryRecord(query.addOrder(direction, sortField)); } - public List queryAntExRecords(AntExRecordQuery antExRecordQuery,Sort.Direction direction,String sortField,int count) { - MongoQuery query = antExRecordQuery.convertToQuery(); - if (StringUtils.isNotEmpty(antExRecordQuery.getNeed())) { - antExRecordQuery.mysqlBuild(count); - query.start(antExRecordQuery.getOffset()).end(antExRecordQuery.getLimit()); - } - return antExRecordDao.queryRecord(query.addOrder(direction, sortField)); - } - - public Integer count(AntExRecordQuery antExRecordQuery) { return antExRecordDao.count(antExRecordQuery.convertToQuery()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 8ff8100..3e4a7a7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.*; +import com.lyms.platform.common.base.PageInfo; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.RiskDefaultTypeEnum; import com.lyms.platform.common.enums.YnEnums; @@ -800,7 +801,7 @@ public class AntExRecordFacade { riskBasicMap.clear(); } - + System.out.println("ids ============ " + ids.size()); if (CollectionUtils.isEmpty(ids)) { return null; @@ -839,11 +840,15 @@ public class AntExRecordFacade { } pageAntExRecordsQuery.setNeed("true"); + pageAntExRecordsQuery.setPage(request.getPage()); + pageAntExRecordsQuery.setLimit(request.getLimit()); pageAntExRecordsQuery.setIds(recordIds); pageAntExRecordsQuery.setLevelId(request.getLevel()); System.out.println("ids = " + ids.size()); - List pageAntExRecords = recordService.queryAntExRecords(pageAntExRecordsQuery, Sort.Direction.DESC, "checkTime",ids.size()); + pageAntExRecordsQuery.mysqlBuild(ids.size()); + + List pageAntExRecords = recordService.queryAntExRecords(pageAntExRecordsQuery); if (CollectionUtils.isNotEmpty(pageAntExRecords)) { for (AntExRecordModel model : pageAntExRecords) -- 1.8.3.1