diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index deb7945..6901471 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -1724,67 +1724,44 @@ public class MatDeliverFacade {
         //根据用户id获取医院ID
         String hospitalId = autoMatchFacade.getHospitalId(matdeliverFollowRequest.getOperatorId());
 
-        // 构造医院id集合
-        List<String> hospitalList = new ArrayList<>();
         List<String> fmhospitalId = new ArrayList<>();
-        //传入了具体的医院id
         if (StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalId())) {
-            hospitalList.add(matdeliverFollowRequest.getHospitalId());
-            if (StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalProvinceId()) || StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalCityId()) || StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalAreaId())) {
-                matDeliverQuery.setFmHospitalList(hospitalList);
-            }
-
-            } else {
-
-                //默认添加当前医院
-                hospitalList.add(hospitalId);
-
-           /* DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
-            dataPermissionsModelQuery.setUserId(matdeliverFollowRequest.getOperatorId());
-            List<DataPermissionsModel> dataPermissionsModelList = dataPermissionService.queryPermission(dataPermissionsModelQuery);
-            if (CollectionUtils.isNotEmpty(dataPermissionsModelList)) {
-                Map data = dataPermissionsModelList.get(0).getData();
-                for (Object hosId : data.keySet()) {
-                    if (StringUtils.isNotEmpty(hosId.toString()) && !hospitalList.contains(hosId.toString())) {
-                        hospitalList.add(hosId.toString());
-                    }
+            fmhospitalId.add(matdeliverFollowRequest.getHospitalId());
+            matDeliverQuery.setFmHospitalList(fmhospitalId);
+        }
+        else if(StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalProvinceId()) || StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalCityId()) || StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalAreaId()))
+        {
+            OrganizationQuery organizationQuery = new OrganizationQuery();
+            if (StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalProvinceId())) {
+                organizationQuery.setProvinceId(matdeliverFollowRequest.getHospitalProvinceId());
+            }
+            if (StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalCityId())) {
+                organizationQuery.setCityId(matdeliverFollowRequest.getHospitalCityId());
+            }
+            if (StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalAreaId())) {
+                organizationQuery.setAreaId(matdeliverFollowRequest.getHospitalAreaId());
+            }
+            organizationQuery.setYn(YnEnums.YES.getId());
+            List<Organization> organizationList = organizationService.queryHospitals(organizationQuery);
+            if (CollectionUtils.isNotEmpty(organizationList)) {
+                for (Organization organization : organizationList) {
+                    fmhospitalId.add(organization.getId().toString());
                 }
-            }*/
-                // 未传入查询条件,进行院内系统进行查询
-                if (StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalProvinceId()) || StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalCityId()) || StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalAreaId())) {
-                    // 传入了查询条件
-                    OrganizationQuery organizationQuery = new OrganizationQuery();
-                    if (StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalProvinceId())) {
-                        organizationQuery.setProvinceId(matdeliverFollowRequest.getHospitalProvinceId());
-                    }
-                    if (StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalCityId())) {
-                        organizationQuery.setCityId(matdeliverFollowRequest.getHospitalCityId());
-                    }
-                    if (StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalAreaId())) {
-                        organizationQuery.setAreaId(matdeliverFollowRequest.getHospitalAreaId());
-                    }
-                    organizationQuery.setYn(YnEnums.YES.getId());
-                    List<Organization> organizationList = organizationService.queryHospitals(organizationQuery);
-                    List<String> orgId = new ArrayList<>();
-                    if (CollectionUtils.isNotEmpty(organizationList)) {
-                        for (Organization organization : organizationList) {
-                            orgId.add(organization.getId().toString());
-                            fmhospitalId.add(organization.getId().toString());
-                        }
-                    }
+            }
 
-                    if (CollectionUtils.isEmpty(fmhospitalId)) {
-                        return listResponse;
-                    } else {
-                        hospitalList.retainAll(fmhospitalId);
-                        if (CollectionUtils.isEmpty(fmhospitalId)) {
-                            return listResponse;
-                        }
-                        matDeliverQuery.setFmHospitalList(hospitalList);
-                    }
+            if (CollectionUtils.isNotEmpty(fmhospitalId))
+            {
+                if (!fmhospitalId.contains(hospitalId))
+                {
+                    fmhospitalId.contains(hospitalId);
                 }
+                matDeliverQuery.setFmHospitalList(fmhospitalId);
             }
-
+            else
+            {
+                return listResponse;
+            }
+        }
 
         if (matdeliverFollowRequest.getFollowStarDate() != null) {
             MatDeliverFollowQuery matDeliverFollowQuery = new MatDeliverFollowQuery();