diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
index 97c0d4d..9ec860d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
@@ -2119,7 +2119,7 @@ public class BabyEarFacade {
             hospitalIds.add(earScreenListRequest.getHospitalId());
         } else {
             //获取用户拥有的权限医院和条件筛选的医院交集
-            hospitalIds = areaCountFacade.getCurrentUserHospPermissions(userId, earScreenListRequest.getOrgProvinceId(), earScreenListRequest.getOrgCityId(), earScreenListRequest.getAreaId());
+            hospitalIds = areaCountFacade.getCurrentUserHospPermissions(userId, earScreenListRequest.getOrgProvinceId(), earScreenListRequest.getOrgCityId(), earScreenListRequest.getOrgAreaId());
         }
         //  List<String> hospital = groupsFacade.findGroupHospital(userId, false);
         String[] hospitalIdArray = new String[hospitalIds.size()];
@@ -2143,24 +2143,23 @@ public class BabyEarFacade {
         screenQuery.setOffset((earScreenListRequest.getPage() - 1) * earScreenListRequest.getLimit());
         screenQuery.setLimit(earScreenListRequest.getLimit());
 
-        BabyModelQuery modelQuery = new BabyModelQuery();
-        modelQuery.setProvinceId(earScreenListRequest.getProvinceId());
-        System.out.println(earScreenListRequest.getProvinceId());
-        modelQuery.setCityId(earScreenListRequest.getCityId());
-        modelQuery.setAreaId(earScreenListRequest.getAreaId());
-        modelQuery.setStreetId(earScreenListRequest.getStreetId());
-        modelQuery.setAreaId(earScreenListRequest.getAreaId());
-        List<BabyModel> babyModels = babyService.queryBabyWithQuery(modelQuery);
-        System.out.println(modelQuery.convertToQuery().convertToMongoQuery());
-
-        List<String> list = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(babyModels)) {
-            for (BabyModel babyModel : babyModels) {
-                list.add(babyModel.getId());
+        if (StringUtils.isNotEmpty(earScreenListRequest.getProvinceId())) {
+            BabyModelQuery modelQuery = new BabyModelQuery();
+            modelQuery.setProvinceId(earScreenListRequest.getProvinceId());
+            modelQuery.setCityId(earScreenListRequest.getCityId());
+            modelQuery.setAreaId(earScreenListRequest.getAreaId());
+            modelQuery.setStreetId(earScreenListRequest.getStreetId());
+            modelQuery.setAreaId(earScreenListRequest.getAreaId());
+            List<BabyModel> babyModels = babyService.queryBabyWithQuery(modelQuery);
+            List<String> list = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(babyModels)) {
+                for (BabyModel babyModel : babyModels) {
+                    list.add(babyModel.getId());
+                }
             }
+            String[] babyIdArray = new String[list.size()];
+            screenQuery.setBabyIds(list.toArray(babyIdArray));
         }
-        String[] babyIdArray = new String[list.size()];
-        screenQuery.setBabyIds(list.toArray(babyIdArray));
         //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id
         if (StringUtils.isNotEmpty(earScreenListRequest.getKeyWord()) || earScreenListRequest.getBirthStartTime() != null || earScreenListRequest.getBirthEndTime() != null) {//关键字：姓名、联系方式、就诊卡 查询babyId
             BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery();