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));