From 812ffe6f989303514b45f8106f09ff902bbe0d8a Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 31 十月 2024 16:19:56 +0800
Subject: [PATCH] update

---
 src/views/ecg/doctor/Routine.vue |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/views/ecg/doctor/Routine.vue b/src/views/ecg/doctor/Routine.vue
index 943e3a1..b0b8fc2 100644
--- a/src/views/ecg/doctor/Routine.vue
+++ b/src/views/ecg/doctor/Routine.vue
@@ -13,7 +13,9 @@
 const roomBedVO: RoomBedVO = {
     roomId: null,
     roomName: null,
-    bedNo: null
+    bedNo: null,
+    checkTypes: null,
+    opType: null
 }
 
 const onStagePatient = ref<QueueVO>({
@@ -43,6 +45,9 @@
     patientList.value = await DoctorApi.finishNextPatient(roomBedVO)
     patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO)
     getOnstagePatient()
+
+    // 鐢ㄤ簬瑙e喅 宸︿晶閲嶇疆鍚� 鑾峰彇褰撳墠銆愬氨璇婁腑銆戞偅鑰�
+    setOnStagePatient(onStagePatient.value)
   } finally {
     finishFlag.value = false
   }
@@ -60,7 +65,7 @@
 }
 
 const callAgain = async () => {
-  await DoctorApi.callAgainPatient(roomBedVO)
+  await DoctorApi.callPatientAgain(roomBedVO)
 }
 
 const getOnstagePatient = () => {
@@ -69,7 +74,7 @@
     // setOnStagePatient(undefined)
   } else if (tempPatient.patId !== onStagePatient.value.patId) {
     onStagePatient.value= tempPatient
-    setOnStagePatient(tempPatient)
+    setOnStagePatient(onStagePatient.value)
   }
 }
 
@@ -126,6 +131,8 @@
     roomBedVO.roomId = userStore.room!.roomId
     roomBedVO.roomName = userStore.room!.roomName
     roomBedVO.bedNo = userStore.room!.bedNo
+    roomBedVO.checkTypes = userStore.room!.checkTypes
+    roomBedVO.opType = userStore.room!.opType
 
     timerRunFlag = true
     doctorTimer()
@@ -146,6 +153,7 @@
 const onEventRoutine = () => {
    //console.info("onDevRentPanelEvent...")
   onStagePatient.value.patId = ""
+  initLoad()
 }
 
 const onEventRecallFinish = () => {
@@ -153,9 +161,9 @@
 }
 
 /** 鎮h�呭彉鏇存搷浣� */
-const devReadyPanelRef = ref()
+const routimePanelRef = ref()
 const setOnStagePatient = (tempPatient: QueueVO | undefined) => {
-  devReadyPanelRef.value.setPatient(tempPatient)
+  routimePanelRef.value.setPatient(tempPatient)
 }
 
 </script>
@@ -163,11 +171,11 @@
 <template>
   <el-container>
     <el-header style="background-color: var(--el-color-primary-light-7); font-size: 24px">
-      <TitlePanel :titleType=2 :room="roomBedVO" :patientStatistic="patientStat" />
+      <TitlePanel :titleType=0 :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"/>
+        <RoutinePanel :room="roomBedVO" ref="routimePanelRef" @event_routine="onEventRoutine"/>
       </el-main>
       <el-aside width="400px" style="border: solid var(--el-color-primary-light-7)">
           <QueuePanel :queue="patientList" @event_RecallFinish="onEventRecallFinish"/>

--
Gitblit v1.9.3