Fix Bug #544: AI修复

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

@@ -1,15 +1,22 @@
 <template>
   <div class="triage-queue-container">
-    <el-card class="filter-card" shadow="never">
-      <el-form :inline="true" :model="queryParams" class="demo-form-inline">
-        <el-form-item label="排队状态">
-          <el-select v-model="queryParams.status" placeholder="全部状态" clearable style="width: 140px;">
+    <el-card class="filter-card">
+      <el-form :model="queryParams" inline>
+        <el-form-item label="科室">
+          <el-select v-model="queryParams.deptId" placeholder="请选择科室" clearable>
+            <el-option label="呼吸内科" value="resp_dept" />
+            <el-option label="全科" value="general_dept" />
+          </el-select>
+        </el-form-item>
+        <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>
-        <el-form-item label="排队时间">
+        <!-- 修复 Bug #544：新增历史队列查询时间范围，默认当天 -->
+        <el-form-item label="排队日期">
           <el-date-picker
             v-model="queryParams.dateRange"
             type="daterange"
@@ -17,7 +24,7 @@
             start-placeholder="开始日期"
             end-placeholder="结束日期"
             value-format="YYYY-MM-DD"
-            style="width: 260px;"
+            @change="handleDateChange"
           />
         </el-form-item>
         <el-form-item>
@@ -27,94 +34,107 @@
       </el-form>
     </el-card>
 
-    <el-card class="table-card" shadow="never" style="margin-top: 16px;">
-      <el-table :data="queueList" border v-loading="loading" style="width: 100%">
-        <el-table-column prop="visit_no" label="就诊号" width="120" />
-        <el-table-column prop="patient_name" label="患者姓名" width="120" />
-        <el-table-column prop="status" label="排队状态" width="100">
+    <el-card class="table-card">
+      <el-table :data="queueList" v-loading="loading" border stripe>
+        <el-table-column prop="patientName" label="患者姓名" width="120" />
+        <el-table-column prop="queueNo" label="排队号" width="100" />
+        <el-table-column prop="status" label="状态" width="100">
           <template #default="{ row }">
-            <el-tag :type="getStatusType(row.status)">{{ formatStatus(row.status) }}</el-tag>
+            <el-tag :type="getStatusType(row.status)">
+              {{ getStatusLabel(row.status) }}
+            </el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="queue_time" label="排队时间" width="180" />
-        <el-table-column prop="triage_nurse" label="分诊护士" width="120" />
+        <el-table-column prop="triageTime" label="分诊时间" width="160" />
+        <el-table-column prop="doctorName" label="接诊医生" width="120" />
+        <el-table-column prop="remark" label="备注" />
       </el-table>
+      <el-pagination
+        v-model:current-page="queryParams.pageNum"
+        v-model:page-size="queryParams.pageSize"
+        :total="total"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleQuery"
+        @current-change="handleQuery"
+        class="pagination"
+      />
     </el-card>
   </div>
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue';
-import axios from 'axios';
-import { ElMessage } from 'element-plus';
+import { ref, reactive, onMounted } from 'vue'
+import { getQueueList } from '@/api/triage/queue'
 
-// 默认当天时间
-const getDefaultDateRange = () => {
-  const today = new Date();
-  const yyyy = today.getFullYear();
-  const mm = String(today.getMonth() + 1).padStart(2, '0');
-  const dd = String(today.getDate()).padStart(2, '0');
-  const todayStr = `${yyyy}-${mm}-${dd}`;
-  return [todayStr, todayStr];
-};
+const loading = ref(false)
+const queueList = ref([])
+const total = ref(0)
 
-const queryParams = ref({
+const queryParams = reactive({
+  deptId: 'resp_dept',
   status: '',
-  dateRange: getDefaultDateRange()
-});
+  dateRange: [],
+  startDate: '',
+  endDate: '',
+  pageNum: 1,
+  pageSize: 20
+})
 
-const queueList = ref([]);
-const loading = ref(false);
+// 修复 Bug #544：初始化默认当天时间
+const initDefaultDate = () => {
+  const today = new Date().toISOString().split('T')[0]
+  queryParams.dateRange = [today, today]
+  queryParams.startDate = today
+  queryParams.endDate = today
+}
+
+const handleDateChange = (val) => {
+  if (val && val.length === 2) {
+    queryParams.startDate = val[0]
+    queryParams.endDate = val[1]
+  } else {
+    queryParams.startDate = ''
+    queryParams.endDate = ''
+  }
+}
 
 const handleQuery = async () => {
-  loading.value = true;
+  loading.value = true
   try {
-    const [start, end] = queryParams.value.dateRange || [];
-    const res = await axios.get('/api/triage/queue/list', {
-      params: {
-        deptId: 1, // 实际应从路由或上下文获取
-        status: queryParams.value.status || null,
-        startTime: start ? `${start} 00:00:00` : null,
-        endTime: end ? `${end} 23:59:59` : null
-      }
-    });
-    queueList.value = res.data || [];
-  } catch (error) {
-    ElMessage.error('查询队列失败');
+    const res = await getQueueList(queryParams)
+    queueList.value = res.data.list
+    total.value = res.data.total
   } finally {
-    loading.value = false;
+    loading.value = false
   }
-};
+}
 
 const resetQuery = () => {
-  queryParams.value.status = '';
-  queryParams.value.dateRange = getDefaultDateRange();
-  handleQuery();
-};
-
-const formatStatus = (status) => {
-  const map = { WAITING: '候诊', IN_PROGRESS: '就诊中', COMPLETED: '完诊' };
-  return map[status] || status;
-};
+  queryParams.status = ''
+  initDefaultDate()
+  queryParams.pageNum = 1
+  handleQuery()
+}
 
 const getStatusType = (status) => {
-  if (status === 'COMPLETED') return 'success';
-  if (status === 'IN_PROGRESS') return 'warning';
-  return 'info';
-};
+  const map = { WAITING: 'info', IN_PROGRESS: 'warning', COMPLETED: 'success' }
+  return map[status] || 'info'
+}
+
+const getStatusLabel = (status) => {
+  const map = { WAITING: '候诊', IN_PROGRESS: '就诊中', COMPLETED: '完诊' }
+  return map[status] || status
+}
 
 onMounted(() => {
-  handleQuery();
-});
+  initDefaultDate()
+  handleQuery()
+})
 </script>
 
 <style scoped>
-.triage-queue-container {
-  padding: 16px;
-  background-color: #f5f7fa;
-  min-height: 100vh;
-}
-.filter-card {
-  margin-bottom: 16px;
-}
+.triage-queue-container { padding: 16px; }
+.filter-card { margin-bottom: 16px; }
+.table-card { min-height: 500px; }
+.pagination { margin-top: 16px; justify-content: flex-end; }
 </style>