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 2068b5e..db45d45 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 @@ -4417,7 +4417,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService for (Patients patients : patientsList) { filingPids.add(patients.getPid()); } - Criteria criteria3 = Criteria.where("pid").in(CollectionUtils.isNotEmpty(filingPids)?filingPids:"") + Criteria criteria3 = Criteria.where("pid").in(filingPids) .and("hospitalId").is(hospitalId) .and("yn").is(YnEnums.YES.getId()) .and("checkTime").gte(startDate).lte(endDate); @@ -4430,13 +4430,13 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService for (Patients patients : antExChuNotList) { antExChuNotPids.add(patients.getPid()); } - Criteria criteria4 = Criteria.where("pid").in(CollectionUtils.isNotEmpty(antExChuNotPids)?antExChuNotPids:"") + Criteria criteria4 = Criteria.where("pid").in(antExChuNotPids) .and("hospitalId").is(hospitalId) .and("yn").is(YnEnums.YES.getId()) .and("checkTime").gte(DateUtil.getMonthDay(startDate,1,1)).lte(DateUtil.getMonthDay(startDate,1,0)); long antExChuNext = mongoTemplate.count(Query.query(criteria4), AntExChuModel.class); //建档未初诊-外院初诊 - Criteria criteria5= Criteria.where("pid").in(CollectionUtils.isNotEmpty(antExChuNotPids)?antExChuNotPids:"") + Criteria criteria5= Criteria.where("pid").in(antExChuNotPids) .and("hospitalId").ne(hospitalId) .and("yn").is(YnEnums.YES.getId()) .and("checkTime").gte(startDate);