From a67a6ba924278933d954e80b9b8b68c1cfbb5089 Mon Sep 17 00:00:00 2001 From: litao Date: Tue, 27 Jun 2017 15:55:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E5=86=8C=E7=BB=9F=E8=AE=A1=E5=8A=A0?= =?UTF-8?q?=E4=B8=8Ayn=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java | 4 ++-- 1 file changed, 2 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 6bca63a..082f5ee 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 @@ -1084,7 +1084,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService .lt(DateUtil.getNextYearDate(year)) .and("hospitalId").is(hospitalId);*/ - Criteria criteria = Criteria.where("hospitalId").is(hospitalId); + Criteria criteria = Criteria.where("hospitalId").is(hospitalId).and("yn").nin(0); /** 产前检查： lyms_antexc（初诊），lyms_antex（复诊）设置pid */ List antenatalExaminationModels = mongoUtil.findField(AntenatalExaminationModel.class, criteria, "parentId"); @@ -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("id").in(patientIds); + .and("hospitalId").is(hospitalId).and("id").in(patientIds).and("yn").nin(0); if(StringUtils.isNotEmpty(provinceId)) { criteria.and("provinceRegisterId").in(CollectionUtils.asList(provinceId)); -- 1.8.3.1