diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index d153527..2ec761e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -2684,6 +2684,7 @@ public class PatientFacade extends BaseServiceImpl { //分娩状态 patientsQuery.setDueStatus(null==patientManagerRequest.getDueStatus() ? null : patientManagerRequest.getDueStatus()); + System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); List patientsList = patientsService.queryPatient(patientsQuery); List patientManagerQueryModelList = new ArrayList <>(); if (CollectionUtils.isNotEmpty(patientsList)) { 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 fd9158b..bdfa161 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 @@ -1271,7 +1271,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService List> hospitalInfos = mongoUtil.getHospitals(userId, provinceId, cityId, aredId, streetId); List hospitalIds = CollectionUtils.getListByKey(hospitalInfos, "id"); Criteria c = new Criteria(); - c.and("hospitalId").in(hospitalIds).and("yn").is(1).and("enable").ne("2").and("buildType").ne(1); + c.and("hospitalId").in(hospitalIds).and("yn").is(1).and("enable").nin(Arrays.asList("1","2")).and("buildType").ne(1); if (startDate != null && endDate != null) { c.and("bookbuildingDate").gte(startDate).lt(DateUtil.addDay(endDate, 1)); }