From f98ab75bf0f7fb54e7e3955a5f6e5a4935a86cbe Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 31 十月 2024 11:21:14 +0800
Subject: [PATCH] fix warning

---
 src/views/ecg/doctor/index.vue |   54 ++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/views/ecg/doctor/index.vue b/src/views/ecg/doctor/index.vue
index 17d3bbe..c0f8906 100644
--- a/src/views/ecg/doctor/index.vue
+++ b/src/views/ecg/doctor/index.vue
@@ -5,14 +5,16 @@
 import {useUserStore} from "@/store/modules/user";
 import {QueueVO} from "@/api/ecg/queue";
 import {ElNotification} from "element-plus";
-import DevInstallPanel from "@/views/ecg/doctor/components/DevInstallPanel.vue";
+import DevReadyPanel from "@/views/ecg/doctor/components/DevReadyPanel.vue";
 
 const userStore = useUserStore();
 
 const roomBedVO: RoomBedVO = {
     roomId: null,
     roomName: null,
-    bedNo: null
+    bedNo: null,
+    checkTypes: null,
+    opType: null
 }
 
 const onStagePatient = ref<QueueVO>({
@@ -39,9 +41,12 @@
 const finishNextPatient = async () => {
   finishFlag.value = true
   try {
-    patientList.value = await DoctorApi.finishNextPatient(roomBedVO)
-    patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO)
+    patientList.value = await DoctorApi.finishReceiveNextPatient(roomBedVO)
+    patientStat.value = await DoctorApi.getDevReadyStatistic(roomBedVO)
     getOnstagePatient()
+
+    // 鐢ㄤ簬瑙ｅ喅 宸︿晶閲嶇疆鍚� 鑾峰彇褰撳墠 銆愬氨璇婁腑銆戞偅鑰�
+    setOnStagePatient(onStagePatient.value)
   } finally {
     finishFlag.value = false
   }
@@ -51,19 +56,23 @@
   passFlag.value = true
   try {
     patientList.value = await DoctorApi.passNextPatient(roomBedVO)
-    patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO)
+    patientStat.value = await DoctorApi.getDevReadyStatistic(roomBedVO)
     getOnstagePatient()
   } finally {
     passFlag.value = false
   }
 }
 
+const callAgain = async () => {
+  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)
   }
 }
@@ -78,13 +87,13 @@
     return
   }
 
-  patientList.value = await DoctorApi.getPatientList(roomBedVO)
+  patientList.value = await DoctorApi.getToBeCheckedPatientList(roomBedVO)
   getOnstagePatient()
-  patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO)
+  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
 }
 
@@ -121,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()
@@ -138,14 +149,20 @@
   timerRunFlag = false
 })
 
-const onEvent = () => {
-  // console.info("onDevRentPanelEvent...")
+const onEventDevReady = () => {
+   //console.info("onDevRentPanelEvent...")
+  onStagePatient.value.patId = ""
+  initLoad()
+}
+
+const onEventRecallFinish = () => {
+  initLoad()
 }
 
 /** 鎮ｈ�呭彉鏇存搷浣� */
-const devInstallPanelRef = ref()
+const devReadyPanelRef = ref()
 const setOnStagePatient = (tempPatient: QueueVO | undefined) => {
-  devInstallPanelRef.value.setPatient(tempPatient)
+  devReadyPanelRef.value.setPatient(tempPatient)
 }
 
 </script>
@@ -153,19 +170,20 @@
 <template>
   <el-container>
     <el-header style="background-color: var(--el-color-primary-light-7); font-size: 24px">
-      <TitlePanel :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" @success="onEvent"/>
+        <DevReadyPanel :room="roomBedVO" ref="devReadyPanelRef" @event_dev_ready="onEventDevReady"/>
       </el-main>
       <el-aside width="400px" style="border: solid var(--el-color-primary-light-7)">
-          <QueuePanel :queue="patientList"/>
+          <QueuePanel :queue="patientList" @event_RecallFinish="onEventRecallFinish"/>
       </el-aside>
     </el-container>
     <el-container class="right-bottom">
       <el-button :disabled="finishFlag" type="primary" @click="finishNextPatient">鍙彿</el-button>
       <el-button :disabled="passFlag" type="primary" @click="passNextPatient">杩囧彿</el-button>
+      <el-button  type="primary" @click="callAgain">閲嶅彨</el-button>
       <el-button :disabled="bedControlFlag" type="primary" @click="bedControl">{{state?'鏆傚仠':'鎭㈠'}}</el-button>
     </el-container>
   </el-container>

--
Gitblit v1.9.3