From 1b145b5655fa023032c8713bb2375bccdf0fc314 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 24 十月 2024 11:13:40 +0800
Subject: [PATCH] 领用完成后 立即刷新 患者列表

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

diff --git a/src/views/ecg/doctor/index.vue b/src/views/ecg/doctor/index.vue
index a9454cc..f1a8328 100644
--- a/src/views/ecg/doctor/index.vue
+++ b/src/views/ecg/doctor/index.vue
@@ -5,6 +5,7 @@
 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";
 
 const userStore = useUserStore();
 
@@ -13,6 +14,11 @@
     roomName: null,
     bedNo: null
 }
+
+const onStagePatient = 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
+})
 
 const patientStat = ref<PatientStatisticVO>({
     finishedNum: 0,
@@ -33,8 +39,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
   }
@@ -44,9 +54,24 @@
   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)
+  } else if (tempPatient.patId !== onStagePatient.value.patId) {
+    onStagePatient.value = tempPatient
+    setOnStagePatient(tempPatient)
   }
 }
 
@@ -60,12 +85,13 @@
     return
   }
 
-  patientList.value = await DoctorApi.getPatientList(roomBedVO)
-  patientStat.value = await DoctorApi.getPatientStatistic(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
 }
 
@@ -85,7 +111,7 @@
 }
 
 const doctorTimer = () => {
-  console.log('doctor ...')
+  console.log('doctorTimer ...')
   initLoad()
   if (timerRunFlag)
     setTimeout(doctorTimer, 5000) // five seconds
@@ -93,7 +119,6 @@
 
 /** 鍒濆鍖� **/
 onMounted(() => {
-  console.info("onMounted - doctor " + userStore.isSetRoom + " " + userStore.room.roomId)
   timerRunFlag = false
   bedControlFlag.value = true
   finishFlag.value = true
@@ -117,33 +142,56 @@
 })
 
 onUnmounted( () =>{
-  console.info("onUnmounted - doctor " + userStore.isSetRoom + " " + userStore.room.roomId)
   timerRunFlag = false
 })
+
+const onEventDevReady = () => {
+   //console.info("onDevRentPanelEvent...")
+  onStagePatient.value.patId = ""
+  initLoad()
+}
+
+const onEventRecallFinish = () => {
+  initLoad()
+}
+
+/** 鎮ｈ�呭彉鏇存搷浣� */
+const devReadyPanelRef = ref()
+const setOnStagePatient = (tempPatient: QueueVO | undefined) => {
+  devReadyPanelRef.value.setPatient(tempPatient)
+}
 
 </script>
 
 <template>
   <el-container>
     <el-header style="background-color: var(--el-color-primary-light-7); font-size: 24px">
-      <TitlePanel :room="roomBedVO" :patientStatistic="patientStat" />
+      <TitlePanel :titleType=0 :room="roomBedVO" :patientStatistic="patientStat" />
     </el-header>
-    <el-container>
-      <el-main>
-        瑁呮満鐣岄潰
+    <el-container style="height: 100%;">
+      <el-main style="border: solid var(--el-color-primary-light-7)">
+        <DevReadyPanel :room="roomBedVO" ref="devReadyPanelRef" @event_dev_ready="onEventDevReady"/>
       </el-main>
-      <el-aside width="300px" style="background-color: var(--el-color-primary-light-7);">
-        <QueuePanel :queue="patientList"/>
+      <el-aside width="400px" style="border: solid var(--el-color-primary-light-7)">
+          <QueuePanel :queue="patientList" @event_RecallFinish="onEventRecallFinish"/>
       </el-aside>
     </el-container>
-    <el-container style="justify-content: center; margin-top: 30px">
+    <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>
 </template>
 
 <style scoped lang="scss">
-
+.right-bottom {
+  position: absolute;
+  bottom: 50px;
+  right: 100px;
+  //background-color: #f00;
+  //color: #fff;
+  //padding: 10px;
+}
 </style>

--
Gitblit v1.9.3