From a65e8dd2cc107ed3618b71f5687d742a77109cab Mon Sep 17 00:00:00 2001
From: chenqi <chen.qi@jin-group.cn>
Date: Tue, 30 Dec 2025 17:01:34 +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参数拼写错误
- 添加科室名称、类型、分类的查询表单
- 实现搜索和重置功能
- 集成分页组件并修正页码参数映射
- 在后端服务中添加查询条件过滤逻辑
- 支持按科室名称、类型、分类进行条件查询
- 实现动态排序功能并修复分页查询逻辑
---
 .../com/openhis/web/basedatamanage/dto/OrganizationDto.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationDto.java
index 1aabbea8..8a2f8bcd 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationDto.java
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
+import lombok.ToString;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -57,6 +58,7 @@ public class OrganizationDto {
     private Integer displayOrder;
 
     /** 子集合 */
+    @ToString.Exclude
     private List<OrganizationDto> children = new ArrayList<>();
     
     /** 挂号科室标记 */