From b9292e1e2d4ee1b461d7724a9d0f5ca27802ed70 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 14 十月 2024 15:38:40 +0800
Subject: [PATCH] bug fix
---
src/views/ecg/doctor/DevInstall.vue | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/src/views/ecg/doctor/DevInstall.vue b/src/views/ecg/doctor/DevInstall.vue
index 970f8af..7f73c91 100644
--- a/src/views/ecg/doctor/DevInstall.vue
+++ b/src/views/ecg/doctor/DevInstall.vue
@@ -15,7 +15,7 @@
bedNo: null
})
-const onStagePatient = ref<QueueVO>({
+const installingPatient = 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
})
@@ -23,6 +23,7 @@
const patientStat = ref<PatientStatisticVO>({
finishedNum: 0,
readyNum: 0,
+ receivedNum: 0,
passedNum: 0,
queuingNum: 0
})
@@ -40,8 +41,8 @@
finishFlag.value = true
try {
patientList.value = await DoctorApi.finishInstallNextPatient(roomBedVO.value)
- patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO.value)
- getOnstagePatient()
+ patientStat.value = await DoctorApi.getDevInstallStatistic(roomBedVO.value)
+ getInstallingPatient()
} finally {
finishFlag.value = false
}
@@ -51,8 +52,8 @@
passFlag.value = true
try {
patientList.value = await DoctorApi.passNextPatient(roomBedVO.value)
- patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO.value)
- getOnstagePatient()
+ patientStat.value = await DoctorApi.getDevInstallStatistic(roomBedVO.value)
+ getInstallingPatient()
} finally {
passFlag.value = false
}
@@ -62,13 +63,13 @@
await DoctorApi.callAgainPatient(roomBedVO.value)
}
-const getOnstagePatient = () => {
- const tempPatient : QueueVO | undefined = patientList.value.find(item => item.status === 30)
+const getInstallingPatient = () => {
+ const tempPatient : QueueVO | undefined = patientList.value.find(item => item.status === 36)
if (undefined === tempPatient) {
- setOnStagePatient(undefined)
- } else if (tempPatient.patId !== onStagePatient.value.patId) {
- onStagePatient.value= tempPatient
- setOnStagePatient(tempPatient)
+ setInstallingPatient(undefined)
+ } else if (tempPatient.patId !== installingPatient.value.patId) {
+ installingPatient.value= tempPatient
+ setInstallingPatient(tempPatient)
}
}
@@ -83,8 +84,8 @@
}
patientList.value = await DoctorApi.getReceivedPatientList(roomBedVO.value)
- getOnstagePatient()
- patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO.value)
+ getInstallingPatient()
+ patientStat.value = await DoctorApi.getDevInstallStatistic(roomBedVO.value)
const queueVO2 = await DoctorApi.bedDoctorGet(roomBedVO.value)
if (queueVO2.status === 20)
state.value = true
@@ -146,6 +147,7 @@
const onEventDevInstall = () => {
//console.info("onDevInstallPanelEvent...")
+ // onStagePatient.value.patId = ""
}
const onEventRecallFinish = () => {
@@ -154,7 +156,7 @@
/** 鎮h�呭彉鏇存搷浣� */
const devInstallPanelRef = ref()
-const setOnStagePatient = (tempPatient: QueueVO | undefined) => {
+const setInstallingPatient = (tempPatient: QueueVO | undefined) => {
devInstallPanelRef.value.setPatient(tempPatient)
}
@@ -163,11 +165,11 @@
<template>
<el-container>
<el-header style="background-color: var(--el-color-primary-light-7); font-size: 24px">
- <TitleInstallPanel :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)">
- <DevInstallPanel ref="devInstallPanelRef" @event_dev_install="onEventDevInstall"/>
+ <DevInstallPanel :room="roomBedVO" ref="devInstallPanelRef" @event_dev_install="onEventDevInstall"/>
</el-main>
<el-aside width="400px" style="border: solid var(--el-color-primary-light-7)">
<QueuePanel :queue="patientList" @event_RecallFinish="onEventRecallFinish"/>
--
Gitblit v1.9.3