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/index.vue | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/views/ecg/doctor/index.vue b/src/views/ecg/doctor/index.vue index c239780..c0f8906 100644 --- a/src/views/ecg/doctor/index.vue +++ b/src/views/ecg/doctor/index.vue @@ -12,7 +12,9 @@ const roomBedVO: RoomBedVO = { roomId: null, roomName: null, - bedNo: null + bedNo: null, + checkTypes: null, + opType: null } const onStagePatient = ref<QueueVO>({ @@ -42,6 +44,9 @@ patientList.value = await DoctorApi.finishReceiveNextPatient(roomBedVO) patientStat.value = await DoctorApi.getDevReadyStatistic(roomBedVO) getOnstagePatient() + + // 鐢ㄤ簬瑙e喅 宸︿晶閲嶇疆鍚� 鑾峰彇褰撳墠 銆愬氨璇婁腑銆戞偅鑰� + setOnStagePatient(onStagePatient.value) } finally { finishFlag.value = false } @@ -59,15 +64,15 @@ } const callAgain = async () => { - await DoctorApi.callAgainPatient(roomBedVO) + await DoctorApi.callPatientAgain(roomBedVO) } const getOnstagePatient = () => { const tempPatient : QueueVO | undefined = patientList.value.find(item => item.status === 30) if (undefined === tempPatient) { - setOnStagePatient(undefined) + // setOnStagePatient(undefined) } else if (tempPatient.patId !== onStagePatient.value.patId) { - onStagePatient.value= tempPatient + onStagePatient.value = tempPatient setOnStagePatient(tempPatient) } } @@ -82,13 +87,13 @@ return } - patientList.value = await DoctorApi.getPatientList(roomBedVO) + patientList.value = await DoctorApi.getToBeCheckedPatientList(roomBedVO) getOnstagePatient() patientStat.value = await DoctorApi.getDevReadyStatistic(roomBedVO) const queueVO2 = await DoctorApi.bedDoctorGet(roomBedVO) - if (queueVO2.status === 20) + if (queueVO2.status === 20) // 宸ヤ綅鐘舵�� 鏈夊尰鐢� state.value = true - else if (queueVO2.status === 30) + else if (queueVO2.status === 30) // 宸ヤ綅鐘舵�� 鏆傚仠 state.value = false } @@ -125,6 +130,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() @@ -144,6 +151,8 @@ const onEventDevReady = () => { //console.info("onDevRentPanelEvent...") + onStagePatient.value.patId = "" + initLoad() } const onEventRecallFinish = () => { @@ -161,7 +170,7 @@ <template> <el-container> <el-header style="background-color: var(--el-color-primary-light-7); font-size: 24px"> - <TitlePanel :titleType=0 :room="roomBedVO" :patientStatistic="patientStat" /> + <TitlePanel :titleType=1 :room="roomBedVO" :patientStatistic="patientStat" /> </el-header> <el-container style="height: 100%;"> <el-main style="border: solid var(--el-color-primary-light-7)"> -- Gitblit v1.9.3