From a986a8d6fb5e44f7044469f5f420ce0d7b5bf235 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期三, 26 十一月 2025 11:36:02 +0800
Subject: [PATCH] 11
---
src/views/ecg/doctor/index.vue | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/src/views/ecg/doctor/index.vue b/src/views/ecg/doctor/index.vue
index e8fd253..0bf3ffa 100644
--- a/src/views/ecg/doctor/index.vue
+++ b/src/views/ecg/doctor/index.vue
@@ -3,12 +3,12 @@
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,
@@ -18,10 +18,10 @@
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,
@@ -48,7 +48,7 @@
getOnstagePatient()
// 鐢ㄤ簬瑙ｅ喅 宸︿晶閲嶇疆鍚� 鑾峰彇褰撳墠 銆愬氨璇婁腑銆戞偅鑰�
- setOnStagePatient(onStagePatient.value)
+ setOnStagePatient(onStagePatient)
} finally {
finishFlag.value = false
}
@@ -70,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)
}
}
@@ -128,12 +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
- 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()
@@ -152,10 +152,11 @@
})
const onEventDevReady = () => {
- //console.info("onDevRentPanelEvent...")
- onStagePatient.value.patId = ""
+ 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
+ }
- console.info("autoCall " + autoCall.value)
if (autoCall.value) {
finishNextPatient()
} else {
@@ -169,7 +170,7 @@
/** 鎮ｈ�呭彉鏇存搷浣� */
const devReadyPanelRef = ref()
-const setOnStagePatient = (tempPatient: QueueVO | undefined) => {
+const setOnStagePatient = (tempPatient: QueueVO | undefined | null) => {
devReadyPanelRef.value.setPatient(tempPatient)
}
--
Gitblit v1.9.3