diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationAppServiceImpl.java
index 187d0d4f..3b77e874 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationAppServiceImpl.java
@@ -56,7 +56,17 @@ public class OrganizationAppServiceImpl implements IOrganizationAppService {
             queryWrapper.and(wrapper -> {
                 String[] classEnums = classEnum.split(",");
                 for (String cls : classEnums) {
-                    wrapper.or().apply("FIND_IN_SET(?, class_enum)", cls.trim());
+                    String trimmedCls = cls.trim();
+                    // 使用OR连接多个条件来匹配逗号分隔的值
+                    wrapper.or().and(subWrapper -> {
+                        subWrapper.eq(Organization::getClassEnum, trimmedCls)
+                                .or()
+                                .likeRight(Organization::getClassEnum, trimmedCls + ",")
+                                .or()
+                                .likeLeft(Organization::getClassEnum, "," + trimmedCls)
+                                .or()
+                                .like(Organization::getClassEnum, "," + trimmedCls + ",");
+                    });
                 }
             });
         }
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java
index 4d03e66d..417d714e 100644
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java
@@ -69,8 +69,17 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
 
         // 如果organizationClass不为null，则添加查询条件
         if (organizationClass != null) {
-            // 支持多选值，使用FIND_IN_SET进行查询
-            queryWrapper.apply("FIND_IN_SET({0}, class_enum)", organizationClass.toString());
+            // 支持多选值，使用LIKE操作符进行查询（适用于PostgreSQL）
+            String classValue = organizationClass.toString();
+            queryWrapper.and(subWrapper -> {
+                subWrapper.eq(Organization::getClassEnum, classValue)
+                        .or()
+                        .likeRight(Organization::getClassEnum, classValue + ",")
+                        .or()
+                        .likeLeft(Organization::getClassEnum, "," + classValue)
+                        .or()
+                        .like(Organization::getClassEnum, "," + classValue + ",");
+            });
         }
 
         return baseMapper.selectList(queryWrapper);