From e25465c223a2e63422acfb58414597ca8fc4df09 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期四, 13 十一月 2025 18:01:55 +0800
Subject: [PATCH] 排队异常、小屏适配问题

---
 src/views/ecg/doctor/index.vue |   56 +++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/src/views/ecg/doctor/index.vue b/src/views/ecg/doctor/index.vue
index f1a8328..0bf3ffa 100644
--- a/src/views/ecg/doctor/index.vue
+++ b/src/views/ecg/doctor/index.vue
@@ -1,24 +1,27 @@
+<!--璁惧棰嗙敤鎿嶄綔鐣岄潰-->
 <script setup lang="ts">
 import TitlePanel from "@/views/ecg/doctor/components/TitlePanel.vue";
 import QueuePanel from "@/views/ecg/doctor/components/QueuePanel.vue";
 import {DoctorApi, PatientStatisticVO, RoomBedVO} from '@/api/ecg/doctor';
-import {useUserStore} from "@/store/modules/user";
 import {QueueVO} from "@/api/ecg/queue";
 import {ElNotification} from "element-plus";
 import DevReadyPanel from "@/views/ecg/doctor/components/DevReadyPanel.vue";
+import {useRoomStore} from "@/store/modules/room";
 
-const userStore = useUserStore();
+const roomStore = useRoomStore();
 
 const roomBedVO: RoomBedVO = {
     roomId: null,
     roomName: null,
-    bedNo: null
+    bedNo: null,
+    checkTypes: null,
+    opType: null
 }
 
-const onStagePatient = ref<QueueVO>({
+let onStagePatient: QueueVO = {
   bedNo: "", bookCheckType: 0, bookTimeslot: 0, expired: 0, id: 0, jumpFlag: 0, passed: 0,
   patGender: 0, patId: "", patName: "", roomId: 0, roomName: "", seqNum: 0, status: 0
-})
+}
 
 const patientStat = ref<PatientStatisticVO>({
     finishedNum: 0,
@@ -27,6 +30,7 @@
     queuingNum: 0
 })
 
+const autoCall = ref<boolean>(false);
 const state = ref<boolean>()
 
 const patientList = ref<QueueVO[]>([])
@@ -44,7 +48,7 @@
     getOnstagePatient()
 
     // 鐢ㄤ簬瑙ｅ喅 宸︿晶閲嶇疆鍚� 鑾峰彇褰撳墠 銆愬氨璇婁腑銆戞偅鑰�
-    setOnStagePatient(onStagePatient.value)
+    setOnStagePatient(onStagePatient)
   } finally {
     finishFlag.value = false
   }
@@ -66,11 +70,11 @@
 }
 
 const getOnstagePatient = () => {
-  const tempPatient : QueueVO | undefined = patientList.value.find(item => item.status === 30)
-  if (undefined === tempPatient) {
+  const tempPatient : QueueVO | undefined | null = patientList.value.find(item => item.status === 30)
+  if (tempPatient == null) {
     // setOnStagePatient(undefined)
-  } else if (tempPatient.patId !== onStagePatient.value.patId) {
-    onStagePatient.value = tempPatient
+  } else if (tempPatient.patId !== onStagePatient.patId) {
+    onStagePatient = tempPatient
     setOnStagePatient(tempPatient)
   }
 }
@@ -124,10 +128,12 @@
   finishFlag.value = true
   passFlag.value = true
 
-  if (userStore.isSetRoom) {
-    roomBedVO.roomId = userStore.room!.roomId
-    roomBedVO.roomName = userStore.room!.roomName
-    roomBedVO.bedNo = userStore.room!.bedNo
+  if (roomStore.isSetRoom) {
+    roomBedVO.roomId = roomStore.room!.roomId
+    roomBedVO.roomName = roomStore.room!.roomName
+    roomBedVO.bedNo = roomStore.room!.bedNo
+    roomBedVO.checkTypes = roomStore.room!.checkTypes
+    roomBedVO.opType = roomStore.room!.opType
 
     timerRunFlag = true
     doctorTimer()
@@ -146,9 +152,16 @@
 })
 
 const onEventDevReady = () => {
-   //console.info("onDevRentPanelEvent...")
-  onStagePatient.value.patId = ""
-  initLoad()
+  onStagePatient = {
+    bedNo: "", bookCheckType: 0, bookTimeslot: 0, expired: 0, id: 0, jumpFlag: 0, passed: 0,
+    patGender: 0, patId: "", patName: "", roomId: 0, roomName: "", seqNum: 0, status: 0
+  }
+
+  if (autoCall.value) {
+    finishNextPatient()
+  } else {
+    initLoad()
+  }
 }
 
 const onEventRecallFinish = () => {
@@ -157,7 +170,7 @@
 
 /** 鎮ｈ�呭彉鏇存搷浣� */
 const devReadyPanelRef = ref()
-const setOnStagePatient = (tempPatient: QueueVO | undefined) => {
+const setOnStagePatient = (tempPatient: QueueVO | undefined | null) => {
   devReadyPanelRef.value.setPatient(tempPatient)
 }
 
@@ -166,17 +179,18 @@
 <template>
   <el-container>
     <el-header style="background-color: var(--el-color-primary-light-7); font-size: 24px">
-      <TitlePanel :titleType=0 :room="roomBedVO" :patientStatistic="patientStat" />
+      <TitlePanel :titleType=1 :room="roomBedVO" :patientStatistic="patientStat" />
     </el-header>
     <el-container style="height: 100%;">
       <el-main style="border: solid var(--el-color-primary-light-7)">
         <DevReadyPanel :room="roomBedVO" ref="devReadyPanelRef" @event_dev_ready="onEventDevReady"/>
       </el-main>
       <el-aside width="400px" style="border: solid var(--el-color-primary-light-7)">
-          <QueuePanel :queue="patientList" @event_RecallFinish="onEventRecallFinish"/>
+          <QueuePanel :room="roomBedVO" :queue="patientList" @event_RecallFinish="onEventRecallFinish"/>
       </el-aside>
     </el-container>
     <el-container class="right-bottom">
+      <el-checkbox label="鑷姩&nbsp;" v-model="autoCall" />
       <el-button :disabled="finishFlag" type="primary" @click="finishNextPatient">鍙彿</el-button>
       <el-button :disabled="passFlag" type="primary" @click="passNextPatient">杩囧彿</el-button>
       <el-button  type="primary" @click="callAgain">閲嶅彨</el-button>
@@ -189,7 +203,7 @@
 .right-bottom {
   position: absolute;
   bottom: 50px;
-  right: 100px;
+  right: 80px;
   //background-color: #f00;
   //color: #fff;
   //padding: 10px;

--
Gitblit v1.9.3