From 348e6bcdc7fa566a48b96dea53d24ec6dda49e1d Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 11 四月 2025 18:06:40 +0800
Subject: [PATCH] update

---
 src/views/ecg/doctor/Routine.vue |   54 ++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/views/ecg/doctor/Routine.vue b/src/views/ecg/doctor/Routine.vue
index 943e3a1..c85e051 100644
--- a/src/views/ecg/doctor/Routine.vue
+++ b/src/views/ecg/doctor/Routine.vue
@@ -1,33 +1,39 @@
+<!--甯歌妫�鏌ョ晫闈�-->
 <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";
+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>({
-  bedNo: "", bookCheckType: 0, bookTimeslot: 0, expired: 0, id: 0, jumpFlag: 0, passed: 0,
-  patGender: 0, patId: "", patName: "", roomId: 0, roomName: "", seqNum: 0, status: 0
+  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 patientStat = ref<PatientStatisticVO>({
     finishedNum: 0,
     readyNum: 0,
+    receivedNum: 0,
     passedNum: 0,
     queuingNum: 0
 })
 
+const autoCall = ref<boolean>(false);
 const state = ref<boolean>()
 
 const patientList = ref<QueueVO[]>([])
@@ -43,6 +49,9 @@
     patientList.value = await DoctorApi.finishNextPatient(roomBedVO)
     patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO)
     getOnstagePatient()
+
+    // 鐢ㄤ簬瑙ｅ喅 宸︿晶閲嶇疆鍚� 鑾峰彇褰撳墠銆愬氨璇婁腑銆戞偅鑰�
+    setOnStagePatient(onStagePatient.value)
   } finally {
     finishFlag.value = false
   }
@@ -60,7 +69,7 @@
 }
 
 const callAgain = async () => {
-  await DoctorApi.callAgainPatient(roomBedVO)
+  await DoctorApi.callPatientAgain(roomBedVO)
 }
 
 const getOnstagePatient = () => {
@@ -69,7 +78,7 @@
     // setOnStagePatient(undefined)
   } else if (tempPatient.patId !== onStagePatient.value.patId) {
     onStagePatient.value= tempPatient
-    setOnStagePatient(tempPatient)
+    setOnStagePatient(onStagePatient.value)
   }
 }
 
@@ -122,10 +131,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,6 +157,12 @@
 const onEventRoutine = () => {
    //console.info("onDevRentPanelEvent...")
   onStagePatient.value.patId = ""
+
+  if (autoCall.value) {
+    finishNextPatient()
+  } else {
+    initLoad()
+  }
 }
 
 const onEventRecallFinish = () => {
@@ -153,9 +170,9 @@
 }
 
 /** 鎮ｈ�呭彉鏇存搷浣� */
-const devReadyPanelRef = ref()
+const routimePanelRef = ref()
 const setOnStagePatient = (tempPatient: QueueVO | undefined) => {
-  devReadyPanelRef.value.setPatient(tempPatient)
+  routimePanelRef.value.setPatient(tempPatient)
 }
 
 </script>
@@ -163,17 +180,18 @@
 <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"/>
+          <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>
@@ -186,7 +204,7 @@
 .right-bottom {
   position: absolute;
   bottom: 50px;
-  right: 100px;
+  right: 80px;
   //background-color: #f00;
   //color: #fff;
   //padding: 10px;

--
Gitblit v1.9.3