From 76c324b0df4c611c6588375b03bdc2fe1a7eee05 Mon Sep 17 00:00:00 2001
From: chenqi <chen.qi@jin-group.cn>
Date: Tue, 30 Dec 2025 17:01:37 +0800
Subject: [PATCH] =?UTF-8?q?feat(organization):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=A7=91=E5=AE=A4=E7=AE=A1=E7=90=86=E6=9F=A5=E8=AF=A2=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复api.js中params参数拼写错误
- 添加科室名称、类型、分类的查询表单
- 实现搜索和重置功能
- 集成分页组件并修正页码参数映射
- 在后端服务中添加查询条件过滤逻辑
- 支持按科室名称、类型、分类进行条件查询
- 实现动态排序功能并修复分页查询逻辑
---
 .../appservice/impl/OrganizationAppServiceImpl.java  | 12 ------------
 1 file changed, 12 deletions(-)

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 cf130391..257d5400 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
@@ -58,18 +58,6 @@ public class OrganizationAppServiceImpl implements IOrganizationAppService {
         // 创建Page对象
         Page<Organization> page = new Page<>(pageNo, pageSize);
 
-        // 处理动态排序（仅当排序字段有效时才添加排序条件）
-        if (sortField != null && !sortField.isEmpty()) {
-            // 校验排序字段是否为Organization实体中的有效字段（防止非法字段）
-            if (isValidField(Organization.class, sortField)) {
-                // 驼峰转下划线处理
-                String underlineField = camelToUnderline(sortField);
-                // 默认为升序，若指定desc则按降序
-                boolean isAsc = sortOrder == null || "asc".equalsIgnoreCase(sortOrder);
-                queryWrapper.last("ORDER BY " + underlineField + " " + (isAsc ? "ASC" : "DESC"));
-            }
-        }
-
         // 执行分页查询
         page = organizationService.page(page, queryWrapper);