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/callingscreen/bigscreen.vue |   65 +++++++++-----------------------
 1 files changed, 18 insertions(+), 47 deletions(-)

diff --git a/src/views/ecg/callingscreen/bigscreen.vue b/src/views/ecg/callingscreen/bigscreen.vue
index 7387ef3..387f7b1 100644
--- a/src/views/ecg/callingscreen/bigscreen.vue
+++ b/src/views/ecg/callingscreen/bigscreen.vue
@@ -1,17 +1,16 @@
 <script setup lang="ts">
 
-import dayjs from 'dayjs'
-import {ScreenApi, statusMap, CallingVO} from "@/api/ecg/screen";
+import {ScreenApi, ScreenQueueVO} from "@/api/ecg/screen";
+import {CallApi, CallVO} from "@/api/ecg/call";
+import {DICT_TYPE} from "@/utils/dict";
 
 defineOptions({ name: 'bigscreen' })
 
-const listReady = ref<CallingVO[]>([]) // 鍒楄〃鐨勬暟鎹�
-const listWaiting = ref<CallingVO[]>([]) // 鍒楄〃鐨勬暟鎹�
-const listPassed = ref<CallingVO[]>([]) //
+const listReady = ref<ScreenQueueVO[]>([]) // 鍒楄〃鐨勬暟鎹�
+const listWaiting = ref<ScreenQueueVO[]>([]) // 鍒楄〃鐨勬暟鎹�
+const listPassed = ref<ScreenQueueVO[]>([]) //
 
-let curSpeakPat : CallingVO | undefined = undefined;
-let curSpeakSeqNum : number = 0
-let curWorkDay : Date | undefined = undefined
+let curSpeakPat : CallVO | null = null;
 
 const getList = async () => {
   const data = await ScreenApi.getBigScreenData()
@@ -23,7 +22,7 @@
 const startScrolling = () => {
   setInterval(() => {
     getList();
-    if ( curSpeakPat === undefined ) {
+    if ( curSpeakPat === null ) {
       initiateSpeak()
     }
   }, 5000); // 姣廥绉掓粴鍔ㄤ竴娆�
@@ -35,35 +34,16 @@
 
 const onSpeachEndEvent = async (event) => {
   console.log("Speech ended... " + event.currentTarget.text);
-  await ScreenApi.markCalled(curSpeakPat!.patId)
+  curSpeakPat!.called = 1
+  await CallApi.updateCall(curSpeakPat!)
   initiateSpeak()
 }
 
-const getNextSpeak = () => {
-  if (listReady.value.length === 0) {
-    return undefined;
-  }
-
-  // 澶勭悊姣忓ぉ 鍙嶈浆鐨勬儏鍐�
-  if ( curWorkDay === undefined) {
-    curSpeakSeqNum = 0;
-    curWorkDay = new Date()
-  } else if (!isSameDate(dayjs(listReady.value[0].bookDate).toDate(), curWorkDay)) {
-    curSpeakSeqNum = 0;
-    curWorkDay = dayjs(listReady.value[0].bookDate).toDate()
-  }
-
-  return listReady.value.find( item => item.status === 30 && item.called === 0 && item.seqNum > curSpeakSeqNum)
-}
-
-const initiateSpeak = () => {
-  const queuePat = getNextSpeak()
-  if (queuePat !== undefined) {
-    curSpeakPat = queuePat
-    curSpeakSeqNum = curSpeakPat.seqNum
-    speak("璇枫��" + queuePat.patName + "鍒�" + queuePat.roomName + "灏辫瘖");
-  } else {
-    curSpeakPat = undefined
+const initiateSpeak = async () => {
+  curSpeakPat = await CallApi.getNextCall()
+  console.info( curSpeakPat )
+  if (curSpeakPat !== null) {
+    speak("璇枫��" + curSpeakPat.patName + "鍒�" + curSpeakPat.roomName + "灏辫瘖");
   }
 }
 
@@ -78,15 +58,6 @@
 
   speech.onend = onSpeachEndEvent
   speechSynthesis.speak(speech)
-}
-
-const isSameDate = ( date1: Date, date2 : Date) => {
-  if (date1.getFullYear() === date2.getFullYear()
-      && date1.getMonth() === date2.getMonth()
-      && date1.getDate() === date2.getDate())
-    return true
-  else
-    return false
 }
 
 const nameDesensitize = (patName) => {
@@ -127,12 +98,12 @@
               label="鎮ｈ�呭鍚�"
               width="80">
             <template #default="scope">
-              {{ nameDesensitize(scope.row.patName) }}
+              {{scope.row.seqNum}} &nbsp; {{ nameDesensitize(scope.row.patName) }}
             </template>
           </el-table-column>
           <el-table-column label="鐘舵��" align="center" prop="status" width="80">
             <template #default="scope">
-              {{ statusMap.get(scope.row.status) }}
+              <dict-tag :type="DICT_TYPE.ECG_QUEUE_STATUS" :value="scope.row.status" />
             </template>
           </el-table-column>
           <el-table-column
@@ -151,7 +122,7 @@
         <el-footer height="100px" style="padding: 0 0">
           <el-header height="30px" style="background-color: #98b8e5; line-height: 30px;">杩囧彿鍖�</el-header>
           <span v-for="(passedItem, index) in listPassed" :key="index">
-            {{nameDesensitize(passedItem.patName) + "&nbsp;&nbsp;&nbsp;&nbsp;"}}
+            {{nameDesensitize(passedItem.patName) + "&nbsp;" + passedItem.roomName + "&nbsp;&nbsp;&nbsp;&nbsp;"}}
           </span>
         </el-footer>
       </el-container>

--
Gitblit v1.9.3