diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java
index 27b5327..79925a0 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java
@@ -29,6 +29,15 @@ public class OrganizationQuery extends BaseQuery {
     private String foreignId;
 
     private List<Integer> typeList;
+    private List<Integer> idList;
+
+    public List<Integer> getIdList() {
+        return idList;
+    }
+
+    public void setIdList(List<Integer> idList) {
+        this.idList = idList;
+    }
 
     public List<Integer> getTypeList() {
         return typeList;
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java
index 7439f43..c883680 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java
@@ -29,7 +29,7 @@ public class UsersQuery extends BaseQuery {
     private String keyword;
     private Integer roleId;
     private String foreignId;
-    private Integer otherAccount;   //第三方帐号, 1医院帐号
+    private Integer otherAccount;   //绗笁鏂瑰笎鍙�, 1鍖婚櫌甯愬彿
     public Integer getOtherAccount() {
         return otherAccount;
     }
diff --git a/platform-biz-service/src/main/resources/mainOrm/Organization.xml b/platform-biz-service/src/main/resources/mainOrm/Organization.xml
index 52f691a..8ad3b79 100644
--- a/platform-biz-service/src/main/resources/mainOrm/Organization.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/Organization.xml
@@ -117,6 +117,12 @@ select id,name,type,level,area_manage,province_id,city_id,area_id,address,descri
             <if test="id != null and id >= 0">
                 and id = #{id,jdbcType=INTEGER}
             </if>
+            <if test="idList !=null  and idList.size() >0">
+                and id in
+                <foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
             <if test="foreignId != null and foreignId != ''">
                 and foreign_id = #{foreignId,jdbcType=VARCHAR}
             </if>
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
index 1f819d5..3227b02 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
@@ -212,24 +212,24 @@ public class OrganizationController extends BaseController {
     public FrontEndResult getOrganization(HttpServletRequest request) {
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
 
-        String areaId = autoMatchFacade.match(loginState.getId());
+        List<Integer> areaId = autoMatchFacade.matchOrgId(loginState.getId());
         List<Map> data = new ArrayList<>();
         List<Organization> organizations;
-        if (StringUtils.isNotEmpty(areaId)) {
+        if (CollectionUtils.isNotEmpty(areaId)) {
             OrganizationQuery organizationQuery = new OrganizationQuery();
-            organizationQuery.setAreaId(areaId);
+            organizationQuery.setIdList(areaId);
             List<Integer> list = new ArrayList<>();
             list.add(3);
             list.add(4);
             organizationQuery.setYn(YnEnums.YES.getId());
-            organizationQuery.setTypeList(list);
+//            organizationQuery.setTypeList(list);
             organizations  = organizationService.queryOrganization(organizationQuery);
 
         } else {
             UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery();
             userOrganizationMapsQuery.setYn(YnEnums.YES.getId());
             userOrganizationMapsQuery.setUserId(loginState.getId());
-            organizations =    accessPermissionFacade.findAccessPerminssionByUserId(loginState.getId());
+            organizations = accessPermissionFacade.findAccessPerminssionByUserId(loginState.getId());
 
         }
         if (CollectionUtils.isNotEmpty(organizations)) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java
index 961b1a4..5098496 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java
@@ -33,6 +33,8 @@ public class AutoMatchFacade {
     private PatientsService patientsService;
     @Autowired
     private UserOrganizationMapsService  userOrganizationMapsService;
+    @Autowired
+    private AccessPermissionFacade accessPermissionFacade;
 
     public String match(int userId) {
         UsersQuery usersQuery = new UsersQuery();
@@ -68,7 +70,13 @@ public class AutoMatchFacade {
                     }
                 }
             }  else{
-                UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery();
+                List<Organization> list2  =accessPermissionFacade.findAccessPerminssionByUserId(list.get(0).getId());
+                if(CollectionUtils.isNotEmpty(list2)){
+                    for(Organization organization:list2){
+                        data.add(organization.getId());
+                    }
+                }
+                /*UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery();
                 userOrganizationMapsQuery.setUserId(list.get(0).getId());
                 userOrganizationMapsQuery.setYn(YnEnums.YES.getId());
                 List<UserOrganizationMaps>  list1  =    userOrganizationMapsService.queryUserOrganizationMaps(userOrganizationMapsQuery);
@@ -76,7 +84,7 @@ public class AutoMatchFacade {
                     for(UserOrganizationMaps userOrganizationMaps:list1){
                         data.add(userOrganizationMaps.getOrgId());
                     }
-                }
+                }*/
             }
         }
         return data;