From 87d4214541879a4a4328e1b8f02c96d495fabfdf Mon Sep 17 00:00:00 2001
From: zhaoyun <zhaoyun@gentronhealth.com>
Date: Thu, 23 Apr 2026 16:37:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AFBug?=
 =?UTF-8?q?=20#396=20#397?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- #396 疾病报卡管理：搜索查询区域布局优化（单行紧凑布局）
- #397 分诊排队管理：页面标题科室名称动态获取（替代硬编码）
---
 .../ReportManagement/index.vue                | 148 +++++++++---------
 .../triageandqueuemanage/cardiology/index.vue |  10 +-
 2 files changed, 85 insertions(+), 73 deletions(-)

diff --git a/openhis-ui-vue3/src/views/diseaseReportManagement/ReportManagement/index.vue b/openhis-ui-vue3/src/views/diseaseReportManagement/ReportManagement/index.vue
index b472fb76..477f75c2 100644
--- a/openhis-ui-vue3/src/views/diseaseReportManagement/ReportManagement/index.vue
+++ b/openhis-ui-vue3/src/views/diseaseReportManagement/ReportManagement/index.vue
@@ -76,78 +76,61 @@
     <div class="filter-section">
       <el-card>
         <div class="filter-container">
-          <el-form :model="filterForm" ref="filterFormRef" label-width="80px" :inline="true" style="flex: 1; overflow: hidden;">
-            <el-row :gutter="16">
-              <!-- 第一行 -->
-              <el-col :span="24">
-                <el-row :gutter="16">
-                  <el-col :span="3">
-                    <el-form-item label="登记来源">
-                      <el-select v-model="filterForm.source" placeholder="全部" clearable>
-                        <el-option label="门诊" value="1" />
-                        <el-option label="住院" value="2" />
-                        <el-option label="急诊" value="3" />
-                        <el-option label="体检" value="4" />
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6">
-                    <el-form-item label="上报时间">
-                      <el-date-picker
-                        v-model="filterForm.dateRange"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        value-format="YYYY-MM-DD"
-                      />
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="3">
-                    <el-form-item label="患者姓名">
-                      <el-input v-model="filterForm.patientName" placeholder="请输入患者姓名" clearable />
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-              </el-col>
-              <!-- 第二行 -->
-              <el-col :span="24">
-                <el-row :gutter="16">
-                  <el-col :span="3">
-                    <el-form-item label="审核状态">
-                      <el-select v-model="filterForm.status" placeholder="全部" clearable>
-                        <el-option
-                          v-for="item in auditStatusList.filter(s => ['1', '2', '3', '5'].includes(s.value))"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value"
-                        />
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="3">
-                    <el-form-item label="上报科室">
-                      <el-tree-select
-                        v-model="filterForm.deptId"
-                        :data="deptTreeData"
-                        :props="{ children: 'children', label: 'label', value: 'value' }"
-                        placeholder="全部科室"
-                        clearable
-                        check-strictly
-                      />
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="18" style="display: flex; align-items: center; justify-content: flex-end;">
-                    <el-button type="primary" @click="handleSearch" :loading="loading">
-                      <el-icon><Search /></el-icon> 查询
-                    </el-button>
-                    <el-button @click="handleReset">
-                      <el-icon><Refresh /></el-icon> 重置
-                    </el-button>
-                  </el-col>
-                </el-row>
-              </el-col>
-            </el-row>
+          <!-- 修复【#396】：优化搜索查询区域布局，所有筛选条件单行排列，按钮紧凑靠右 -->
+          <el-form :model="filterForm" ref="filterFormRef" label-width="70px" :inline="true">
+            <div class="filter-row">
+              <el-form-item label="登记来源">
+                <el-select v-model="filterForm.source" placeholder="全部" clearable style="width: 100px">
+                  <el-option label="门诊" value="1" />
+                  <el-option label="住院" value="2" />
+                  <el-option label="急诊" value="3" />
+                  <el-option label="体检" value="4" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="上报时间">
+                <el-date-picker
+                  v-model="filterForm.dateRange"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  value-format="YYYY-MM-DD"
+                  style="width: 220px"
+                />
+              </el-form-item>
+              <el-form-item label="患者姓名">
+                <el-input v-model="filterForm.patientName" placeholder="请输入" clearable style="width: 120px" />
+              </el-form-item>
+              <el-form-item label="审核状态">
+                <el-select v-model="filterForm.status" placeholder="全部" clearable style="width: 110px">
+                  <el-option
+                    v-for="item in auditStatusList.filter(s => ['1', '2', '3', '5'].includes(s.value))"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="上报科室">
+                <el-tree-select
+                  v-model="filterForm.deptId"
+                  :data="deptTreeData"
+                  :props="{ children: 'children', label: 'label', value: 'value' }"
+                  placeholder="全部科室"
+                  clearable
+                  check-strictly
+                  style="width: 140px"
+                />
+              </el-form-item>
+              <div class="filter-buttons">
+                <el-button type="primary" @click="handleSearch" :loading="loading">
+                  <el-icon><Search /></el-icon> 查询
+                </el-button>
+                <el-button @click="handleReset">
+                  <el-icon><Refresh /></el-icon> 重置
+                </el-button>
+              </div>
+            </div>
           </el-form>
         </div>
       </el-card>
@@ -1318,6 +1301,27 @@ function getAuditTypeName(type) {
   width: 100%;
 }
 
+/* 修复【#396】：单行筛选布局样式 */
+.filter-row {
+  display: flex;
+  align-items: center;
+  flex-wrap: nowrap;
+  gap: 8px;
+}
+
+.filter-row .el-form-item {
+  display: inline-flex !important;
+  width: auto !important;
+  margin-bottom: 0;
+}
+
+.filter-buttons {
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+  margin-left: auto;
+}
+
 /* 表格区 */
 .table-section {
   flex: 1;
diff --git a/openhis-ui-vue3/src/views/triageandqueuemanage/cardiology/index.vue b/openhis-ui-vue3/src/views/triageandqueuemanage/cardiology/index.vue
index 2da23115..cbba225d 100644
--- a/openhis-ui-vue3/src/views/triageandqueuemanage/cardiology/index.vue
+++ b/openhis-ui-vue3/src/views/triageandqueuemanage/cardiology/index.vue
@@ -3,7 +3,7 @@
     <!-- 顶部标题栏 -->
     <div class="header-section">
       <div class="header-left">
-            <span class="title">智能分诊排队管理 - 心内科</span>
+            <span class="title">智能分诊排队管理 - {{ currentDeptName }}</span>
       </div>
       <div class="header-right">
         <el-button type="primary" @click="handleRefresh">
@@ -401,6 +401,9 @@
 
 <script setup>
 import { ref, reactive, computed, onMounted, onUnmounted } from 'vue'
+import { useUserStore } from '@/store/modules/user'
+
+const userStore = useUserStore()
 import { Refresh } from '@element-plus/icons-vue'
 import { ElMessage } from 'element-plus'
 import {
@@ -443,6 +446,11 @@ const selectedDept = ref('all')
 // 就诊科室列表
 const departmentList = ref([])
 
+// 修复【#397】：动态获取当前科室名称
+const currentDeptName = computed(() => {
+  return userStore.deptName || userStore.orgName || '心内科'
+})
+
 // 后台配置对话框
 const configDialogVisible = ref(false)
 const rules = ref([