From f030d8a9607cef32ee41e01d96817c7e47681602 Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期五, 30 五月 2025 15:18:47 +0800 Subject: [PATCH] 11 --- src/views/ecg/doctor/Routine.vue | 44 ++++++++++++++++++++++++++------------------ 1 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/views/ecg/doctor/Routine.vue b/src/views/ecg/doctor/Routine.vue index 4f52518..671c8d0 100644 --- a/src/views/ecg/doctor/Routine.vue +++ b/src/views/ecg/doctor/Routine.vue @@ -1,14 +1,14 @@ +<!--甯歌妫�鏌ョ晫闈�--> <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, @@ -18,14 +18,17 @@ 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 -}) +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 patientStat = ref<PatientStatisticVO>({ finishedNum: 0, readyNum: 0, + receivedNum: 0, passedNum: 0, queuingNum: 0 }) @@ -48,7 +51,7 @@ getOnstagePatient() // 鐢ㄤ簬瑙e喅 宸︿晶閲嶇疆鍚� 鑾峰彇褰撳墠銆愬氨璇婁腑銆戞偅鑰� - setOnStagePatient(onStagePatient.value) + setOnStagePatient(onStagePatient) } finally { finishFlag.value = false } @@ -73,9 +76,9 @@ 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(onStagePatient.value) + } else if (tempPatient.patId !== onStagePatient.patId) { + onStagePatient = tempPatient + setOnStagePatient(onStagePatient) } } @@ -128,12 +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 - roomBedVO.checkTypes = userStore.room!.checkTypes - roomBedVO.opType = userStore.room!.opType + 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() @@ -153,7 +156,12 @@ const onEventRoutine = () => { //console.info("onDevRentPanelEvent...") - onStagePatient.value.patId = "" + 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() -- Gitblit v1.9.3