Fix Bug #544: AI修复

openhis-ui-vue3/src/views/triage/TriageQueue.vue

@@ -1,17 +1,22 @@
 <template>
   <div class="triage-queue-container">
-    <!-- 查询条件 -->
-    <el-card class="search-card" shadow="never">
+    <el-card class="search-card">
       <el-form :inline="true" :model="queryParams" class="search-form">
-        <el-form-item label="排队状态">
-          <el-select v-model="queryParams.status" placeholder="全部" clearable style="width: 120px">
-            <el-option label="全部" value="" />
-            <el-option label="候诊" value="候诊" />
-            <el-option label="就诊中" value="就诊中" />
-            <el-option label="完诊" value="完诊" />
+        <el-form-item label="科室">
+          <el-select v-model="queryParams.deptCode" placeholder="请选择科室" clearable>
+            <el-option label="呼吸内科" value="RESP" />
+            <el-option label="全科" value="GENERAL" />
           </el-select>
         </el-form-item>
-        <el-form-item label="日期范围">
+        <el-form-item label="状态">
+          <el-select v-model="queryParams.status" placeholder="全部状态" clearable>
+            <el-option label="候诊" value="WAITING" />
+            <el-option label="就诊中" value="IN_PROGRESS" />
+            <el-option label="完诊" value="COMPLETED" />
+          </el-select>
+        </el-form-item>
+        <!-- 修复 Bug #544：新增历史队列查询时间范围选择器，默认当天 -->
+        <el-form-item label="排队时间">
           <el-date-picker
             v-model="queryParams.dateRange"
             type="daterange"
@@ -19,86 +24,92 @@
             start-placeholder="开始日期"
             end-placeholder="结束日期"
             value-format="YYYY-MM-DD"
-            class="date-range-picker"
+            :default-value="[todayStr, todayStr]"
           />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleSearch">查询历史队列</el-button>
-          <el-button @click="handleReset">重置</el-button>
+          <el-button type="primary" @click="handleQuery">查询</el-button>
+          <el-button @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
     </el-card>
 
-    <!-- 队列列表 -->
-    <el-card class="table-card" shadow="never" style="margin-top: 16px;">
-      <el-table :data="tableData" border stripe v-loading="loading" style="width: 100%">
-        <el-table-column prop="patientName" label="患者姓名" width="120" />
-        <el-table-column prop="deptName" label="科室" width="120" />
-        <el-table-column prop="doctorName" label="接诊医生" width="120" />
-        <el-table-column prop="queueStatus" label="排队状态" width="100">
+    <el-card class="table-card">
+      <el-table :data="queueList" v-loading="loading" border>
+        <el-table-column prop="patientName" label="患者姓名" />
+        <el-table-column prop="queueNo" label="排队号" />
+        <el-table-column prop="status" label="状态">
           <template #default="{ row }">
-            <el-tag :type="getStatusType(row.queueStatus)">{{ row.queueStatus }}</el-tag>
+            <el-tag :type="getStatusType(row.status)">{{ row.statusLabel }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="triageTime" label="分诊时间" width="180" />
+        <el-table-column prop="triageTime" label="分诊时间" />
       </el-table>
+      <el-pagination
+        v-model:current-page="queryParams.pageNum"
+        v-model:page-size="queryParams.pageSize"
+        :total="total"
+        @current-change="handleQuery"
+        layout="total, prev, pager, next"
+        class="pagination"
+      />
     </el-card>
   </div>
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue'
-import { ElMessage } from 'element-plus'
-import request from '@/utils/request'
+import { ref, reactive, onMounted, computed } from 'vue';
+import { getQueueList } from '@/api/triage/queue';
 
-const queryParams = ref({
+const loading = ref(false);
+const queueList = ref([]);
+const total = ref(0);
+
+const todayStr = computed(() => new Date().toISOString().split('T')[0]);
+
+const queryParams = reactive({
+  pageNum: 1,
+  pageSize: 20,
+  deptCode: 'GENERAL',
   status: '',
-  dateRange: []
-})
-const tableData = ref([])
-const loading = ref(false)
-
-const fetchQueueList = async () => {
-  loading.value = true
-  try {
-    const [startDate, endDate] = queryParams.value.dateRange || []
-    const res = await request.get('/api/triage/queue', {
-      params: {
-        status: queryParams.value.status || undefined,
-        startDate: startDate,
-        endDate: endDate
-      }
-    })
-    tableData.value = res.data || []
-  } catch (e) {
-    ElMessage.error('获取队列数据失败')
-  } finally {
-    loading.value = false
-  }
-}
-
-const handleSearch = () => {
-  if (!queryParams.value.dateRange || queryParams.value.dateRange.length !== 2) {
-    ElMessage.warning('请选择日期范围')
-    return
-  }
-  fetchQueueList()
-}
-
-const handleReset = () => {
-  queryParams.value = { status: '', dateRange: [] }
-  fetchQueueList()
-}
+  dateRange: [todayStr.value, todayStr.value]
+});
 
 const getStatusType = (status) => {
-  const map = { '候诊': 'info', '就诊中': 'warning', '完诊': 'success' }
-  return map[status] || 'info'
-}
+  const map = { WAITING: 'info', IN_PROGRESS: 'warning', COMPLETED: 'success' };
+  return map[status] || 'info';
+};
+
+const handleQuery = async () => {
+  loading.value = true;
+  try {
+    const params = {
+      ...queryParams,
+      startDate: queryParams.dateRange?.[0] || null,
+      endDate: queryParams.dateRange?.[1] || null
+    };
+    const res = await getQueueList(params);
+    queueList.value = res.data.list;
+    total.value = res.data.total;
+  } finally {
+    loading.value = false;
+  }
+};
+
+const resetQuery = () => {
+  queryParams.status = '';
+  queryParams.dateRange = [todayStr.value, todayStr.value];
+  queryParams.pageNum = 1;
+  handleQuery();
+};
 
 onMounted(() => {
-  // 默认加载当天数据
-  const today = new Date().toISOString().split('T')[0]
-  queryParams.value.dateRange = [today, today]
-  fetchQueueList()
-})
+  handleQuery();
+});
 </script>
+
+<style scoped>
+.triage-queue-container { padding: 16px; }
+.search-card { margin-bottom: 16px; }
+.pagination { margin-top: 16px; justify-content: flex-end; }
+</style>