From ed8a140acde4f9b14162c2f8d7bb7d8218e57155 Mon Sep 17 00:00:00 2001 From: litao Date: Fri, 23 Jun 2017 14:58:56 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20=E5=BB=BA=E5=86=8C?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/service/impl/ReportServiceImpl.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 c575288..5bcd9cb 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 @@ -1115,13 +1115,22 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService } /** 增加年份条件限制 */ - criteria = Criteria.where("created").gte(DateUtil.getYearDate(year)) + criteria = Criteria.where("bookbuildingDate").gte(DateUtil.getYearDate(year)) .lt(DateUtil.getNextYearDate(year)) .and("hospitalId").is(hospitalId); + if(StringUtils.isNotEmpty(provinceId)) { criteria.and("provinceId").in(CollectionUtils.asList(provinceId)); } + if(StringUtils.isNotEmpty(cityId)) { + criteria.and("cityId").in(CollectionUtils.asList(cityId)); + } + + if(StringUtils.isNotEmpty(areaId)) { + criteria.and("areaId").in(CollectionUtils.asList(areaId)); + } + List patients = mongoTemplate.find(Query.query(criteria), Patients.class); ReportModel reportModel = new ReportModel(); reportModel.setLegend(Arrays.asList("秦皇岛市", "辖区外")); -- 1.8.3.1