From aa2d6665f95a0701b61272fd8065663070565034 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期二, 15 四月 2025 12:31:05 +0800 Subject: [PATCH] bug fix: pat_id dev_id 都为空时 不应该取患者列表 --- src/views/ecg/doctor/DevInstall.vue | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/views/ecg/doctor/DevInstall.vue b/src/views/ecg/doctor/DevInstall.vue index 06bbebc..190c3df 100644 --- a/src/views/ecg/doctor/DevInstall.vue +++ b/src/views/ecg/doctor/DevInstall.vue @@ -3,7 +3,6 @@ import DevInstallPanel from "@/views/ecg/doctor/components/DevInstallPanel.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 {useRoomStore} from "@/store/modules/room"; @@ -18,10 +17,10 @@ opType: null }) -const installingPatient = ref<QueueVO>({ +let installingPatient: 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, @@ -49,7 +48,7 @@ getInstallingPatient() // 鐢ㄤ簬瑙e喅 宸︿晶閲嶇疆鍚� 鑾峰彇褰撳墠 銆愬畨瑁呬腑銆戞偅鑰� - setInstallingPatient(installingPatient.value) + setInstallingPatient(installingPatient) } finally { finishFlag.value = false } @@ -71,11 +70,11 @@ } const getInstallingPatient = () => { - const tempPatient : QueueVO | undefined = patientList.value.find(item => item.status === 36) - if (undefined === tempPatient) { + const tempPatient : QueueVO | undefined | null = patientList.value.find(item => item.status === 36) + if (tempPatient == null) { //setInstallingPatient(undefined) - } else if (tempPatient.patId !== installingPatient.value.patId) { - installingPatient.value= tempPatient + } else if (tempPatient.patId !== installingPatient.patId) { + installingPatient = tempPatient setInstallingPatient(tempPatient) } } @@ -155,8 +154,7 @@ }) const onEventDevInstall = () => { - //console.info("onDevInstallPanelEvent...") - installingPatient.value.patId = "" + installingPatient.patId = "" if (autoCall.value) { finishNextPatient() -- Gitblit v1.9.3