diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
index 75cccbb..5d87ae3 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
@@ -3691,11 +3691,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl {
 
     public BaseResponse getBabyZyzdItems( Integer page, Integer limit, String areaId, String streetId, Date dateTime,Integer type) {
         //获得区县下的街道
-        List<BasicConfig> regions = getRegions(areaId,streetId);
-        List<String> streetIds = new ArrayList<>();
-        for (BasicConfig region : regions) {
-            streetIds.add(region.getId());
-        }
+        List<String> streetIds = getRegionsStreetIds( areaId, streetId);
         BabyCheckModelQuery checkModelQuery1 = new BabyCheckModelQuery();
         if (CollectionUtils.isNotEmpty(streetIds))
         {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java
index aef8282..6900909 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java
@@ -188,6 +188,23 @@ public class SmnFacade {
         {
             query.addCriteria(Criteria.where("sendHospitalId").is(param.getSendHospitalId()));
         }
+        else
+        {
+            String orgProvinceId = param.getOrgProvinceId();
+            if (StringUtils.isNotEmpty(orgProvinceId)) {
+                query.addCriteria(Criteria.where("orgProvinceId").is(orgProvinceId));
+            }
+
+            String orgCityId = param.getOrgCityId();
+            if (StringUtils.isNotEmpty(orgCityId)) {
+                query.addCriteria(Criteria.where("orgCityId").is(orgCityId));
+            }
+
+            String orgAreaId = param.getOrgAreaId();
+            if (StringUtils.isNotEmpty(orgAreaId)) {
+                query.addCriteria(Criteria.where("orgAreaId").is(orgAreaId));
+            }
+        }
 
         String pid = param.getPid();
         if (StringUtils.isNotEmpty(pid)) {
@@ -202,22 +219,6 @@ public class SmnFacade {
             query.addCriteria(Criteria.where("patientId").is(patientId));
         }
 
-        String orgProvinceId = param.getOrgProvinceId();
-        if (StringUtils.isNotEmpty(orgProvinceId)) {
-            query.addCriteria(Criteria.where("orgProvinceId").is(orgProvinceId));
-        }
-
-        String orgCityId = param.getOrgCityId();
-        if (StringUtils.isNotEmpty(orgCityId)) {
-            query.addCriteria(Criteria.where("orgCityId").is(orgCityId));
-        }
-
-        String orgAreaId = param.getOrgAreaId();
-        if (StringUtils.isNotEmpty(orgAreaId)) {
-            query.addCriteria(Criteria.where("orgAreaId").is(orgAreaId));
-        }
-
-
         if(StringUtils.isNotEmpty(param.getHusbandQueryNo()))
         {
             query.addCriteria(new Criteria().