From 9c752d6d5bf0cf123dd706955019fbb2dce9db2a Mon Sep 17 00:00:00 2001 From: litao Date: Tue, 27 Jun 2017 15:38:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E5=86=8C=E7=BB=9F=E8=AE=A1bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/service/impl/ReportServiceImpl.java | 2 +- .../main/java/com/lyms/platform/operate/web/utils/MongoUtil.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index a51affd..6bca63a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -1125,7 +1125,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService /** 增加年份条件限制 */ criteria = Criteria.where("bookbuildingDate").gte(DateUtil.getYearDate(year)) .lt(DateUtil.getNextYearDate(year)) - .and("hospitalId").is(hospitalId); + .and("hospitalId").is(hospitalId).and("id").in(patientIds); if(StringUtils.isNotEmpty(provinceId)) { criteria.and("provinceRegisterId").in(CollectionUtils.asList(provinceId)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java index 52a32af..6a7dc23 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java @@ -51,10 +51,14 @@ public class MongoUtil { * @return */ public List> getListByGroup(List patients) { - Map codeMap = new HashMap<>(); /** key为 provinceId_cityId_areaId_month */ Map otherMap = new HashMap<>(); /** key为 month */ + + /* for (Patients patient : patients) { + System.out.println("id:" + patient.getId() + "\tarea: " + patient.getAreaRegisterId() + "\tprovince: " + patient.getProvinceRegisterId() + "\tcity: " + patient.getCityId() + "\tdate: " + patient.getBookbuildingDate().toLocaleString()); + }*/ + for (Patients patient : patients) { Date bookbuildingDate = patient.getBookbuildingDate(); if(bookbuildingDate == null) { -- 1.8.3.1