From e8783d9f8f80cb2e29e201924df594faff007f4e Mon Sep 17 00:00:00 2001
From: chenjinyang <1950285536@qq.com>
Date: Wed, 14 Jan 2026 10:44:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=AB=E5=8F=B7=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=B1=8F=E8=B7=B3=E8=BD=AC=E5=BC=82=E5=B8=B8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../callnumberdisplay/index.vue               | 54 +++++++++++++------
 1 file changed, 38 insertions(+), 16 deletions(-)

diff --git a/openhis-ui-vue3/src/views/triageandqueuemanage/callnumberdisplay/index.vue b/openhis-ui-vue3/src/views/triageandqueuemanage/callnumberdisplay/index.vue
index 3ed4f484..b4c6fa4c 100644
--- a/openhis-ui-vue3/src/views/triageandqueuemanage/callnumberdisplay/index.vue
+++ b/openhis-ui-vue3/src/views/triageandqueuemanage/callnumberdisplay/index.vue
@@ -31,20 +31,22 @@
             </tr>
           </thead>
           <tbody>
-            <template v-for="(group, doctorName) in groupedPatients" :key="doctorName">
-              <!-- 医生分组标题 -->
-              <tr class="doctor-header">
-                <td colspan="4">{{ doctorName }} 医生 (诊室: {{ getDoctorRoom(doctorName) }})</td>
-              </tr>
-              <!-- 患者列表 -->
-              <tr v-for="(patient, index) in group" :key="patient.id">
-                <td>{{ index + 1 }}</td>
-                <td>{{ formatPatientName(patient.name) }}</td>
-                <td>{{ getDoctorRoom(doctorName) }}</td>
-                <td :style="{ color: index === 0 ? '#e74c3c' : '#27ae60' }">
-                  {{ index === 0 ? '就诊中' : '等待' }}
-                </td>
-              </tr>
+            <template v-for="doctorName in paginatedDoctors" :key="doctorName">
+              <template v-if="groupedPatients[doctorName]">
+                <!-- 医生分组标题 -->
+                <tr class="doctor-header">
+                  <td colspan="4">{{ doctorName }} 医生 (诊室: {{ getDoctorRoom(doctorName) }})</td>
+                </tr>
+                <!-- 患者列表 -->
+                <tr v-for="(patient, index) in groupedPatients[doctorName]" :key="patient.id">
+                  <td>{{ index + 1 }}</td>
+                  <td>{{ formatPatientName(patient.name) }}</td>
+                  <td>{{ getDoctorRoom(doctorName) }}</td>
+                  <td :style="{ color: index === 0 ? '#e74c3c' : '#27ae60' }">
+                    {{ index === 0 ? '就诊中' : '等待' }}
+                  </td>
+                </tr>
+              </template>
             </template>
           </tbody>
         </table>
@@ -126,9 +128,29 @@ const waitingCount = computed(() => {
   return count
 })
 
+// 获取排序后的医生列表
+const sortedDoctors = computed(() => {
+  return Object.keys(groupedPatients.value).sort()
+})
+
+// 按医生分组的分页逻辑
+const paginatedDoctors = computed(() => {
+  const startIndex = (currentPage.value - 1) * 1 // 每页显示1个医生组
+  const endIndex = startIndex + 1
+  return sortedDoctors.value.slice(startIndex, endIndex)
+})
+
+// 获取当前页的患者
+const currentPatients = computed(() => {
+  const result = {}
+  paginatedDoctors.value.forEach(doctor => {
+    result[doctor] = groupedPatients.value[doctor]
+  })
+  return result
+})
+
 const totalPages = computed(() => {
-  const totalPatients = patients.value.length
-  return Math.ceil(totalPatients / patientsPerPage) || 1
+  return Math.ceil(sortedDoctors.value.length) || 1
 })
 
 // 方法