From 01ee694a3bb8048372fc793a8de314d70b688b35 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期日, 18 十月 2026 22:36:21 +0800
Subject: [PATCH] 修改了工位

---
 src/views/ecg/doctor/Routine.vue |  514 ++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 432 insertions(+), 82 deletions(-)

diff --git a/src/views/ecg/doctor/Routine.vue b/src/views/ecg/doctor/Routine.vue
index d6d7d3d..a0baaba 100644
--- a/src/views/ecg/doctor/Routine.vue
+++ b/src/views/ecg/doctor/Routine.vue
@@ -1,41 +1,168 @@
+<!--甯歌妫�鏌ョ晫闈�-->
 <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 RoutinePanel from "@/views/ecg/doctor/components/RoutinePanel.vue";
+// 鍙彿妫�鏌ワ紙甯歌妫�鏌ワ級椤点��
+// 鍘熸湰缂哄皯缁勪欢 name锛岄渶涓庤彍鍗� system_menu(2850).component_name 淇濇寔涓�鑷达紝
+// 鍚﹀垯 keep-alive 鐨� :include 鍖归厤澶辫触锛屽垏鍥炴爣绛鹃〉浼氶噸鏂板姞杞藉苟鍒锋柊鏁版嵁銆�
+defineOptions({ name: 'routine' })
 
-const userStore = useUserStore();
+import TitlePanel from '@/views/ecg/doctor/components/TitlePanel.vue'
+import QueuePanel from '@/views/ecg/doctor/components/QueuePanel.vue'
+import DoctorPageLayout from '@/components/DoctorPageLayout/src/DoctorPageLayout.vue'
+import { DoctorApi, PatientStatisticVO, RoomBedVO, } from '@/api/ecg/doctor'
+import { notifySeatInvalidOnce, isSeatInvalidError, resetSeatInvalidNotify } from '@/utils/seatGuard'
+import { QueueVO } from '@/api/ecg/queue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import RoutinePanel from '@/views/ecg/doctor/components/RoutinePanel.vue'
+import { useRoomStore } from '@/store/modules/room'
 
-const roomBedVO: RoomBedVO = {
-    roomId: null,
-    roomName: null,
-    bedNo: null
+const roomStore = useRoomStore()
+
+/**
+ * 褰撳墠宸ヤ綅淇℃伅銆�
+ *
+ * 銆愭湰娆¢渶姹傘�戝繀椤绘槸**鍝嶅簲寮�**瀵硅薄锛氬垏鎹㈠伐浣嶆椂椤甸潰浼氭妸瀹冩敼鎴愭柊宸ヤ綅鐨勫�硷紝
+ * 鑻ユ槸鏅�氬璞★紝宸ヤ綅鍚嶇О/妫�鏌ラ」鐩瓑鏄剧ず涓嶄細閲嶇粯锛堢湅璧锋潵鍍�"娌℃崲杩囨潵"锛夈��
+ */
+const roomBedVO = reactive<RoomBedVO>({
+  roomId: null,
+  roomName: null,
+  bedNo: null,
+  checkTypes: null,
+  opType: null
+})
+const setappointmentId = ref<string>('');
+let onStagePatient: QueueVO = {
+  id: 0,
+  patId: '',
+  patName: '',
+  patGender: 0,
+  bookTimeslot: 0,
+  bookCheckType: 0,
+  isVip: 0,
+  seqNum: 0,
+  bookSeqNum: 0,
+  passed: 0,
+  expired: 0,
+  jumpFlag: 0,
+  roomId: 0,
+  roomName: '',
+  bedNo: '',
+  status: 0
 }
 
-const onStagePatient = ref<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,
-    readyNum: 0,
-    passedNum: 0,
-    queuingNum: 0
+  finishedNum: 0,
+  readyNum: 0,
+  receivedNum: 0,
+  passedNum: 0,
+  queuingNum: 0
 })
 
+const autoCall = ref<boolean>(false)
 const state = ref<boolean>()
 
 const patientList = ref<QueueVO[]>([])
+/** 銆愭湰璇婂鏈垎閰嶃�戞湰宸ヤ綅妫�鏌ョ被鍨嬩笅銆佽繕娌″垎閰嶅伐浣嶇殑"鎺掗槦涓�"鎮h�咃紙鍙墜宸ユ媺鍏ワ級 */
+const roomWaitingList = ref<QueueVO[]>([])
+/** 銆愯嚜鍔╄瘖鏂�戞渶杩戜竴娆″彇鏁扮殑璇存槑锛堢┖鍒楄〃鏃舵樉绀猴級 */
+const fetchInfo = ref('')
 
-let timerRunFlag : boolean = false
-const bedControlFlag = ref<boolean>(true);
-const finishFlag = ref<boolean>(true);
-const passFlag = ref<boolean>(true);
+let timerRunFlag: boolean = false
+const bedControlFlag = ref<boolean>(true)
+const finishFlag = ref<boolean>(true)
+const passFlag = ref<boolean>(true)
+
+// ==================== 闇�姹�3锛氬仠姝㈠�欒瘖寮�鍏� ====================
+// 璇箟锛氬紑鍚悗銆愬凡鏈夊�欒瘖鐥呬汉缁х画鍙彿锛屼絾涓嶅啀鏂板鍊欒瘖鐥呬汉銆戯紱鍏抽棴鍚庢仮澶嶃��
+// 涓庝笂闈㈢殑"鏆傚仠/鎭㈠"鏄�**涓や釜鐙珛姒傚康**锛氭殏鍋滀細鎶婂氨璇婁腑鎮h�呭己鍒跺畬鎴愩��
+// 骞舵妸鍊欒瘖鎮h�呰涪鍑哄伐浣嶏紱鏈紑鍏冲彧鎷︽埅"鏂板"锛屼笉鍔ㄥ凡鏈夋偅鑰呫��
+const stopReady = ref<boolean>(false)
+const stopReadyFlag = ref<boolean>(true) // 闃茶繛鐐�
+
+const loadStopReady = async () => {
+  try {
+    stopReady.value = await DoctorApi.getStopReady(roomBedVO)
+  } catch (e) {
+    // 鏌ヨ澶辫触涓嶆墦鏂疆璇紱淇濇寔涓婁竴娆$姸鎬�
+  } finally {
+    stopReadyFlag.value = false
+  }
+}
+
+const onStopReadyChange = async (val: boolean) => {
+  stopReadyFlag.value = true
+  try {
+    if (val) {
+      await DoctorApi.stopReady(roomBedVO)
+      ElMessage.success('宸插仠姝㈠�欒瘖锛氫笉鍐嶆帴鏀舵柊鐨勫�欒瘖鎮h�咃紝宸叉湁鎮h�呬粛鍙甯稿彨鍙�')
+    } else {
+      await DoctorApi.resumeReady(roomBedVO)
+      ElMessage.success('宸叉仮澶嶅�欒瘖锛氬紑濮嬫帴鏀舵柊鐨勫�欒瘖鎮h��')
+    }
+    await initLoad()
+  } catch (e) {
+    // 澶辫触鍥炴粴寮�鍏虫樉绀�
+    stopReady.value = !val
+  } finally {
+    stopReadyFlag.value = false
+  }
+}
+
+// ==================== 闇�姹�2锛氭挙閿�鍙彿 / 鎾ら攢妫�鏌ュ畬鎴� ====================
+const undoFlag = ref<boolean>(false)
+
+/** 鎾ら攢璇偣"鍙彿"锛氭妸褰撳墠灏辫瘖涓殑鎮h�呴��鍥炲�欒瘖鍖� */
+const undoCall = async () => {
+  try {
+    await ElMessageBox.confirm(
+      '纭畾瑕佹挙閿�鏈鍙彿鍚楋紵璇ユ偅鑰呭皢鍥炲埌鍊欒瘖鍖猴紝鍙噸鏂板彨鍙枫��',
+      '鎾ら攢鍙彿',
+      { type: 'warning', confirmButtonText: '纭畾鎾ら攢', cancelButtonText: '鍙栨秷' }
+    )
+  } catch {
+    return // 鐢ㄦ埛鍙栨秷
+  }
+  undoFlag.value = true
+  try {
+    const msg = await DoctorApi.undoCallPatient(roomBedVO)
+    ElMessage.success(msg || '宸叉挙閿�鍙彿')
+    await initLoad()
+  } finally {
+    undoFlag.value = false
+  }
+}
+
+/** 鎾ら攢"妫�鏌ュ畬鎴�"锛氭妸鏈�杩戜竴浣嶅凡瀹屾垚鎮h�呴��鍥炲�欒瘖鍖� */
+const undoFinish = async () => {
+  const last = await DoctorApi.lastFinishedPatient(roomBedVO)
+  if (!last || !last.patId) {
+    ElMessage.warning('鏈伐浣嶄粖鏃ユ殏鏃犲凡瀹屾垚鐨勬鏌ヨ褰�')
+    return
+  }
+  try {
+    await ElMessageBox.confirm(
+      `纭畾鎾ら攢銆�${last.patName || last.patId}銆嶇殑銆屽畬鎴愩�嶇姸鎬佸悧锛熻鎮h�呭皢鍥炲埌鍊欒瘖鍖恒�俙,
+      '鎾ら攢',
+      { type: 'warning', confirmButtonText: '纭畾鎾ら攢', cancelButtonText: '鍙栨秷' }
+    )
+  } catch {
+    return // 鐢ㄦ埛鍙栨秷
+  }
+  undoFlag.value = true
+  try {
+    const msg = await DoctorApi.undoFinishPatient({
+      ...roomBedVO,
+      patId: last.patId,
+      checkType: last.bookCheckType
+    } as any)
+    ElMessage.success(msg || '宸叉挙閿�')
+    // 銆愭挙閿�鏍囪瘑銆戞挙閿�鍚庣珛鍒诲埛鏂般�屽凡瀹屾垚璁板綍銆嶅垪琛紝璁╄繖鏉¤褰曟樉绀烘垚銆屽凡鎾ら攢銆�
+    routimePanelRef.value?.getList?.()
+    await initLoad()
+  } finally {
+    undoFlag.value = false
+  }
+}
 
 const finishNextPatient = async () => {
   finishFlag.value = true
@@ -43,6 +170,10 @@
     patientList.value = await DoctorApi.finishNextPatient(roomBedVO)
     patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO)
     getOnstagePatient()
+
+    // 鐢ㄤ簬瑙e喅 宸︿晶閲嶇疆鍚� 鑾峰彇褰撳墠銆愬氨璇婁腑銆戞偅鑰�
+    setOnStagePatient(onStagePatient)
+    console.log(onStagePatient, '998')
   } finally {
     finishFlag.value = false
   }
@@ -53,6 +184,35 @@
   try {
     patientList.value = await DoctorApi.passNextPatient(roomBedVO)
     patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO)
+
+    // ========================================================================
+    // 銆愪慨澶嶃�戣繃鍙峰悗鍚屾牱瑕�**娓呯┖宸︿笂鏂规偅鑰呬俊鎭�**锛岃〃绀哄彲浠ュ彨涓嬩竴浣嶄簡銆�
+    //
+    // 鍘熷厛鍙皟 getOnstagePatient()锛岃�岃鏂规硶鍦ㄦ壘涓嶅埌 status===30 鐨勬偅鑰呮椂
+    // **浠�涔堥兘涓嶅仛**锛堝畠鍐呴儴閭h setOnStagePatient(undefined) 鏄娉ㄩ噴鎺夌殑锛夛紝
+    // 浜庢槸杩囧彿鍚庡乏涓婅浠嶇暀鐫�涓婁竴浣嶆偅鑰呯殑淇℃伅锛屽尰鐢熶細浠ヤ负杩樺湪澶勭悊浠栥��
+    // 杩欓噷涓庛�屾鏌ュ畬鎴愩��(onEventRoutine) 淇濇寔涓�鑷寸殑鏀跺熬鍔ㄤ綔銆�
+    // ========================================================================
+    onStagePatient = {
+      id: 0,
+      patId: '',
+      patName: '',
+      patGender: 0,
+      bookTimeslot: 0,
+      bookCheckType: 0,
+      isVip: 0,
+      seqNum: 0,
+      bookSeqNum: 0,
+      passed: 0,
+      expired: 0,
+      jumpFlag: 0,
+      roomId: 0,
+      roomName: '',
+      bedNo: '',
+      status: 0
+    }
+    routimePanelRef.value?.setPatient(undefined)
+
     getOnstagePatient()
   } finally {
     passFlag.value = false
@@ -60,37 +220,121 @@
 }
 
 const callAgain = async () => {
-  await DoctorApi.callAgainPatient(roomBedVO)
+  await DoctorApi.callPatientAgain(roomBedVO)
 }
 
 const getOnstagePatient = () => {
-  const tempPatient : QueueVO | undefined = patientList.value.find(item => item.status === 30)
+  const tempPatient: QueueVO | undefined = patientList.value.find((item) => item.status === 30)
   if (undefined === tempPatient) {
-    setOnStagePatient(undefined)
-  } else if (tempPatient.patId !== onStagePatient.value.patId) {
-    onStagePatient.value= tempPatient
-    setOnStagePatient(tempPatient)
+    // setOnStagePatient(undefined)
+  } else if (tempPatient.patId !== onStagePatient.patId) {
+    onStagePatient = tempPatient
+    setOnStagePatient(onStagePatient)
   }
+}
+
+/**
+ * 銆愭湰璇婂鏈垎閰嶃�戝姞杞�"鏈伐浣嶆鏌ョ被鍨嬩笅銆佽繕娌″垎閰嶅伐浣嶇殑鎺掗槦涓偅鑰�"銆�
+ *
+ * 鍊欒瘖鍒楄〃鎸� room_id + bed_no 鏌ワ紝鍙惈宸插垎娴佸埌鏈伐浣嶇殑浜猴紱鑰�"鎺掗槦涓�(10)"鐨勪汉 bed_no 涓虹┖
+ * 锛堝ぇ灞忎細鏄剧ず銆佸伐浣滃彴鍘熷厛鐪嬩笉鍒帮級鈥斺�旂幇鍦哄弽棣堢殑"鎮h�呭垪琛ㄦ病鍙栧埌鎮h�呬俊鎭�"灏辨槸杩欎釜銆�
+ * 杩欓噷鎶婁粬浠崟鐙彇鍥炴潵灞曠ず锛屽伐浣嶄富浜哄彲涓�閿�屾媺鍏ャ�嶃��
+ *
+ * 澶辫触涓嶅奖鍝嶄富娴佺▼锛堝彧鎵撴棩蹇楋級锛氳繖涓尯鍧楀彧鎻愪緵渚垮埄锛屼笉鏄繀闇�鏁版嵁銆�
+ */
+const loadRoomWaitingList = async () => {
+  if (roomBedVO.roomId == null) return
+  try {
+    roomWaitingList.value = (await DoctorApi.getRoomWaitingList(roomBedVO)) || []
+  } catch (e) {
+    console.warn('[loadRoomWaitingList] 鍙栨湰璇婂鏈垎閰嶆偅鑰呭け璐�', e)
+  }
+}
+
+/** 銆屾媺鍏ャ�嶏細鎶婃帓闃熶腑鐨勬偅鑰呮墜宸ュ垎鍒版湰宸ヤ綅锛堝悗绔牎楠岋細蹇呴』鏄湰宸ヤ綅涓讳汉 + 妫�鏌ラ」鐩尮閰嶏級 */
+const onEventPullWaiting = async (item: any) => {
+  try {
+    await ElMessageBox.confirm(
+      `鎶娿��${item.patName || ''}銆嶆媺鍏ユ湰宸ヤ綅锛�${roomBedVO.roomName || ''} ${roomBedVO.bedNo || ''}锛夛紵`,
+      '鎷夊叆鎺掗槦鎮h��',
+      { confirmButtonText: '鎷夊叆', cancelButtonText: '鍙栨秷', type: 'warning' }
+    )
+  } catch {
+    return
+  }
+  try {
+    const data = await DoctorApi.pullWaitingPatient({
+      roomId: roomBedVO.roomId,
+      bedNo: roomBedVO.bedNo,
+      id: item.id
+    })
+    if (data !== 'success' && data !== undefined && data !== null && data !== '') {
+      // 鍚庣閿欒鐮佷細鎶涘嚭寮傚父锛堝"宸茶鍏朵粬宸ヤ綅鎷夊叆"锛夛紝璧板埌杩欓噷鐨勬甯歌繑鍥炴槸 success
+      console.warn('[onEventPullWaiting] 杩斿洖锛�', data)
+    }
+    ElMessage.success(`宸叉妸銆�${item.patName || ''}銆嶆媺鍏ユ湰宸ヤ綅`)
+  } catch (e) {
+    // 鎺ュ彛寮傚父锛堝惈閿欒鐮佹彁绀猴級鐢卞叏灞�鎷︽埅鍣ㄦ彁绀猴紝杩欓噷鍙渶鍒锋柊鍒楄〃
+    console.warn('[onEventPullWaiting] 鎷夊叆澶辫触', e)
+  }
+  await initLoad()
+}
+
+/**
+ * 銆岀珛鍗宠ˉ浜恒�嶏細鎵嬪姩瑙﹀彂涓�娆℃湰宸ヤ綅鐨勮嚜鍔ㄥ垎娴侊紝骞舵妸鍚庣杩斿洖鐨�"涓轰粈涔堟病琛�/琛ヤ簡鍑犱汉"灞曠ず鍑烘潵銆�
+ *
+ * 绯荤粺鍙湪銆愬紑璇娿�戙�佹湰宸ヤ綅鏈紑銆愬仠姝㈠�欒瘖銆戙�佸�欒瘖浜烘暟鏈揪涓婇檺鏃舵墠浼氳嚜鍔ㄨˉ浜猴紱
+ * 杩欎笁閬撻棬闂稿師鍏堥兘鏄潤榛樼殑锛岀幇鍦哄彧鑳界湅鍒�"鎺掗槦鐨勪汉灏辨槸涓嶈繘鍊欒瘖鍖�"銆�
+ */
+const onEventHurryUp = async () => {
+  try {
+    const data: any = await DoctorApi.hurryUpNow(roomBedVO)
+    const lines = Object.entries(data || {})
+      .map(([k, v]) => `${k}锛�${v === null || v === undefined || v === '' ? '锛堢┖锛�' : v}`)
+      .join('\n')
+    await ElMessageBox.alert(lines, '绔嬪嵆琛ヤ汉 路 璇婃柇缁撴灉', {
+      confirmButtonText: '鐭ラ亾浜�',
+      type: data?.鏈琛ュ叆 > 0 ? 'success' : 'warning'
+    })
+  } catch (e: any) {
+    ElMessage({ message: '绔嬪嵆琛ヤ汉澶辫触锛�' + (e?.message || e), type: 'warning', duration: 4000 })
+  }
+  await initLoad()
 }
 
 const initLoad = async () => {
   if (roomBedVO.roomId == null) {
-    ElNotification.error({
-      message: '璇烽噸鏂板氨搴�!',
-      type: 'info',
-      duration: 3000 // 鑷姩鍏抽棴鏃堕棿锛岄粯璁や负3000ms
-    })
+    // 銆愭湰闇�姹傘�戞病鏈夊伐浣嶏細**鍋滄帀杞**骞跺彧鎻愮ず涓�娆★紙鍘熸潵姣� 5 绉掑脊涓�娆★紝鐜板満琛ㄧ幇灏辨槸"涓�鐩磋烦"锛�
+    timerRunFlag = false
+    notifySeatInvalidOnce()
     return
   }
 
-  patientList.value = await DoctorApi.getPatientList(roomBedVO)
+  patientList.value = (await DoctorApi.getToBeCheckedPatientList(roomBedVO)) || []
+  // 銆愯嚜鍔╄瘖鏂�戣褰曟湰娆″彇鏁版椂闂翠笌鏉℃暟锛堢┖鍒楄〃鏃舵樉绀猴紝渚夸簬鍖哄垎"杞娌¤窇/鍚庣娌℃暟鎹�"锛�
+  fetchInfo.value = `鏈�杩戝彇鏁� ${new Date().toLocaleTimeString()} 路 杩斿洖 ${patientList.value.length} 鏉
+  // 銆愭湰璇婂鏈垎閰嶃�戞湰宸ヤ綅妫�鏌ョ被鍨嬩笅銆佽繕娌″垎閰嶅伐浣嶇殑"鎺掗槦涓�"鎮h�咃紙鍙墜宸ユ媺鍏ワ級
+  loadRoomWaitingList()
   getOnstagePatient()
   patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO)
-  const queueVO2 = await DoctorApi.bedDoctorGet(roomBedVO)
-  if (queueVO2.status === 20)
-    state.value = true
-  else if (queueVO2.status === 30)
-    state.value = false
+  // 銆愭湰闇�姹傘�慴ed-doctor-get 鏄�"鎴戞槸鍚﹁繕鍧愬湪杩欓噷"鐨勫垽瀹氾細澶辫触璇存槑宸ヤ綅宸茶閲婃斁 / 浠栦汉鎺ユ墜锛�
+  // 姝ゆ椂鍋滄帀杞骞朵竴娆℃�ф彁绀猴紝閬垮厤姣� 5 绉掑埛涓�娆�"璇烽噸鏂板氨搴�"銆�
+  let queueVO2: any
+  try {
+    queueVO2 = await DoctorApi.bedDoctorGet(roomBedVO)
+  } catch (e: any) {
+    if (isSeatInvalidError(e)) {
+      timerRunFlag = false
+      notifySeatInvalidOnce()
+      return
+    }
+    throw e
+  }
+  // 銆愬姞鍥恒�戞帴鍙e彲鑳借繑鍥� null锛屽師鏉ョ洿鎺ュ彇 .status 浼氭姏寮傚父銆佷腑鏂湰杞悗缁楠�
+  if (queueVO2 && queueVO2.status === 20) state.value = true
+  else if (queueVO2 && queueVO2.status === 30) state.value = false
+  // 闇�姹�3锛氬悓姝�"鍋滄鍊欒瘖"寮�鍏崇姸鎬侊紙鍏朵粬鍖荤敓/鍏朵粬缁堢鏀瑰姩鍚庢湰绔篃鑳界湅鍒帮級
+  await loadStopReady()
 }
 
 const bedControl = async () => {
@@ -110,10 +354,45 @@
 
 const doctorTimer = () => {
   console.log('doctorTimer ...')
-  initLoad()
-  if (timerRunFlag)
-    setTimeout(doctorTimer, 5000) // five seconds
+  // 銆愬姞鍥恒�戝崟杞彇鏁板け璐ヤ笉鑳藉彉鎴� unhandled rejection锛�
+  // 鍘熸潵鐩存帴 `initLoad()`锛堜笉 await銆佷笉 catch锛夛紝涓�鏃︽煇杞帴鍙e紓甯革紝閿欒琚悶鎺夈��
+  // 椤甸潰鍋滃湪鏃ф暟鎹紙鐜板満琛ㄧ幇灏辨槸"鎮h�呭垪琛ㄤ竴鐩存槸绌虹殑"锛岃�屽簱閲屾湁鎮h�咃級銆�
+  initLoad().catch((e) => console.error('[doctorTimer] 鏈疆鍙栨暟澶辫触锛堝凡蹇界暐锛屼笅涓�杞户缁級', e))
+  if (timerRunFlag) setTimeout(doctorTimer, 5000) // five seconds
 }
+
+/**
+ * 銆愪富/鍥磋銆戣窡闅� store 鍒囨崲"姝e湪鏌ョ湅鐨勫伐浣�"銆�
+ *
+ * roomBedVO 鍘熸潵鍙湪 onMounted 鏃朵粠 store 鎷蜂竴娆� 鈫� 鐢ㄩ《閮ㄣ�屽伐浣嶃�嶄笅鎷夊垏鍒板埆鐨勪汉宸ヤ綅锛堝洿瑙傦級鍚庯紝
+ * 鏈〉鏁版嵁涓嶄細璺熺潃鍙橈紝蹇呴』鍒锋柊椤甸潰鎵嶇敓鏁堛�傝繖閲� watch 涓�涓嬪嵆鍙嵆鏃剁敓鏁�
+ * 锛堝彇鏁板畾鏃跺櫒浼氱珛鍒绘媺鍒版柊宸ヤ綅鐨勬暟鎹級銆�
+ */
+watch(
+  () => [roomStore.room?.roomId, roomStore.room?.bedNo],
+  async () => {
+    if (!roomStore.room) return
+    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
+    // 銆愭湰闇�姹傘�戦噸鏂版嬁鍒板伐浣� -> 澶嶄綅銆愬伐浣嶅け鏁堛�戞彁绀猴紝鍏佽涓嬫鍐嶆彁绀轰竴娆�
+    resetSeatInvalidNotify()
+    // 銆愭湰娆¢渶姹傘�戞崲宸ヤ綅鍚�**鏁撮〉鏁版嵁閮芥崲鎴愭柊宸ヤ綅鐨�**锛�
+    // 鈶� 鍏堟竻绌哄乏渚�"鎮h�呬俊鎭�"锛堥伩鍏嶈繕鏄剧ず涓婁竴涓伐浣嶇殑鎮h�咃級
+    routimePanelRef.value?.setPatient?.(undefined)
+    // 鈶� 鍚姩/缁х画鍙栨暟瀹氭椂鍣紙鍊欒瘖鍒楄〃銆佺粺璁°�佸綋鍓嶅彨鍙锋偅鑰呫�佸仠姝㈠�欒瘖寮�鍏抽兘浼氬埛鏂帮級
+    if (!timerRunFlag && roomBedVO.roomId != null) {
+      timerRunFlag = true
+      doctorTimer()
+    } else if (roomBedVO.roomId != null) {
+      await initLoad()
+    }
+    // 鈶� 鍒锋柊銆屽凡瀹屾垚鍒楄〃銆嶏紙闈㈡澘鍐呬細鎸夋柊宸ヤ綅鐨� checkTypes 閲嶆柊杩囨护锛�
+    routimePanelRef.value?.getList?.()
+  }
+)
 
 /** 鍒濆鍖� **/
 onMounted(() => {
@@ -122,10 +401,13 @@
   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
+    resetSeatInvalidNotify()
 
     timerRunFlag = true
     doctorTimer()
@@ -139,12 +421,36 @@
   passFlag.value = false
 })
 
-onUnmounted( () =>{
+onUnmounted(() => {
   timerRunFlag = false
 })
 
 const onEventRoutine = () => {
-   //console.info("onDevRentPanelEvent...")
+  //console.info("onDevRentPanelEvent...")
+  onStagePatient = {
+    id: 0,
+    patId: '',
+    patName: '',
+    patGender: 0,
+    bookTimeslot: 0,
+    bookCheckType: 0,
+    isVip: 0,
+    seqNum: 0,
+    bookSeqNum: 0,
+    passed: 0,
+    expired: 0,
+    jumpFlag: 0,
+    roomId: 0,
+    roomName: '',
+    bedNo: '',
+    status: 0
+  }
+
+  if (autoCall.value) {
+    finishNextPatient()
+  } else {
+    initLoad()
+  }
 }
 
 const onEventRecallFinish = () => {
@@ -152,42 +458,86 @@
 }
 
 /** 鎮h�呭彉鏇存搷浣� */
-const devReadyPanelRef = ref()
+const routimePanelRef = ref()
 const setOnStagePatient = (tempPatient: QueueVO | undefined) => {
-  devReadyPanelRef.value.setPatient(tempPatient)
+  // 瀹夊叏鐨勭┖鍊兼鏌�
+  if (!tempPatient) {
+    console.warn('Received undefined or null patient data');
+    setappointmentId.value = '';
+    return;
+  }
+  
+  // 浣跨敤鍙�夐摼閬垮厤 patDetails 涓� undefined 鐨勬儏鍐�
+  const appointmentId = tempPatient.patDetails?.appointmentId;
+  console.log(appointmentId, '9987');
+  
+  setappointmentId.value = appointmentId || '';
+  routimePanelRef.value.setPatient(tempPatient)
 }
-
 </script>
 
 <template>
-  <el-container>
-    <el-header style="background-color: var(--el-color-primary-light-7); font-size: 24px">
-      <TitlePanel :room="roomBedVO" :patientStatistic="patientStat" />
-    </el-header>
-    <el-container style="height: 100%;">
-      <el-main style="border: solid var(--el-color-primary-light-7)">
-        <RoutinePanel :room="roomBedVO" ref="devReadyPanelRef" @event_routine="onEventRoutine"/>
-      </el-main>
-      <el-aside width="400px" style="border: solid var(--el-color-primary-light-7)">
-          <QueuePanel :queue="patientList" @event_RecallFinish="onEventRecallFinish"/>
-      </el-aside>
-    </el-container>
-    <el-container class="right-bottom">
+  <!--
+    甯冨眬浼樺寲锛氬姛鑳芥寜閽浐瀹氬湪椤甸潰搴曢儴锛屼笉鍐嶇敤 position:absolute 娴湪鍐呭涓娿��
+    路 鏍囬鏍忓浐瀹氬湪椤堕儴
+    路 涓棿鍖猴紙鎮h�呬俊鎭� + 宸插畬鎴愯褰曞垪琛級涓烘粴鍔ㄥ尯锛屾偅鑰呬俊鎭敱 RoutinePanel 鍐呴儴璁句负
+      sticky 閽夊湪椤堕儴锛屽彧鏈夎褰曞垪琛ㄦ粴鍔�
+    路 鍙充晶鎮h�呴槦鍒楃嫭绔嬫粴鍔�
+    路 銆屽彨鍙�/杩囧彿/閲嶅彨/鏆傚仠/鎾ら攢鍙彿銆嶇瓑鎸夐挳杩� #footer锛屽浐瀹氬湪搴曢儴锛屾案涓嶈璁板綍鍒楄〃閬尅
+    璇﹁ components/DoctorPageLayout銆�
+  -->
+  <DoctorPageLayout :bed-switch-op-types="[0]">
+    <template #header>
+      <TitlePanel :titleType="0" :room="roomBedVO" :patientStatistic="patientStat" />
+    </template>
+
+    <RoutinePanel
+      :room="roomBedVO"
+      :setappointmentId="setappointmentId"
+      ref="routimePanelRef"
+      :undo-disabled="undoFlag"
+      :undo-loading="undoFlag"
+      @event_routine="onEventRoutine"
+      @event_undo_finish="undoFinish"
+    />
+
+    <template #aside>
+      <QueuePanel :room="roomBedVO" :queue="patientList" :waiting-list="roomWaitingList"
+                  :fetch-info="fetchInfo"
+                  @event_RecallFinish="onEventRecallFinish"
+                  @event_PullWaiting="onEventPullWaiting"
+                  @event_HurryUp="onEventHurryUp" />
+    </template>
+
+    <!-- 搴曢儴鎺т欢锛氳嚜鍔� + 鍔熻兘鎸夐挳 + 鍋滄鍊欒瘖锛屾暣缁勯潬鍙� -->
+    <template #footer>
+      <!-- 鑷姩 澶嶉�夋 -->
+      <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>
-      <el-button :disabled="bedControlFlag" type="primary" @click="bedControl">{{state?'鏆傚仠':'鎭㈠'}}</el-button>
-    </el-container>
-  </el-container>
+      <el-button type="primary" @click="callAgain">閲嶅彨</el-button>
+      <el-button :disabled="bedControlFlag" type="primary" @click="bedControl">{{
+        state ? '鏆傚仠' : '鎭㈠'
+      }}</el-button>
+      <!-- 闇�姹�3锛氬仠姝㈠�欒瘖寮�鍏筹紙宸叉湁鍊欒瘖鐥呬汉缁х画鍙彿锛屼絾涓嶅啀鏂板鍊欒瘖鐥呬汉锛� -->
+      <el-switch
+        v-model="stopReady"
+        :disabled="stopReadyFlag"
+        active-text="鍋滄鍊欒瘖"
+        inactive-text="姝e父鎺ヨ瘖"
+        inline-prompt
+        style="--el-switch-on-color: #e6a23c"
+        @change="onStopReadyChange"
+      />
+      <!-- 闇�姹�2锛氭挙閿�璇偣鍙彿锛堝洖鍒板�欒瘖鍖猴級銆�
+           闇�姹�11锛氥�屾挙閿�瀹屾垚銆嶅凡鏀瑰悕涓恒�屾挙閿�銆嶏紝骞剁Щ鍒般�屽凡瀹屾垚妫�鏌ヨ褰曞垪琛ㄣ�嶇殑鏈�鍓嶉潰銆� -->
+      <el-button :disabled="undoFlag" type="warning" plain @click="undoCall">鎾ら攢鍙彿</el-button>
+    </template>
+  </DoctorPageLayout>
 </template>
 
-<style scoped lang="scss">
-.right-bottom {
-  position: absolute;
-  bottom: 50px;
-  right: 100px;
-  //background-color: #f00;
-  //color: #fff;
-  //padding: 10px;
-}
-</style>
+<!--
+  鍘熷厛杩欓噷鏈� .right-bottom { position:absolute; bottom:50px; right:80px }锛�
+  姝f槸"璁板綍鍒楄〃鍙橀暱鍚庣洊浣忓姛鑳芥寜閽�"鐨勬牴鍥狅紙鎸夐挳鑴辩鏂囨。娴併�佷笉鍗犲竷灞�绌洪棿锛夈��
+  鐜版敼鐢� DoctorPageLayout 鐨� #footer 鎵胯浇锛氭甯告枃妗f祦涓殑鍥哄畾搴曟爮锛屾棤闇�鍋忕Щ銆�
+-->

--
Gitblit v1.9.3