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 @@
-
-
-
-
-
- | {{ index + 1 }} |
- {{ formatPatientName(patient.name) }} |
- {{ getDoctorRoom(doctorName) }} |
-
- {{ index === 0 ? '就诊中' : '等待' }}
- |
-
+
+
+
+
+
+
+ | {{ index + 1 }} |
+ {{ formatPatientName(patient.name) }} |
+ {{ getDoctorRoom(doctorName) }} |
+
+ {{ index === 0 ? '就诊中' : '等待' }}
+ |
+
+
@@ -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
})
// 方法