bug fix

eight

2024-10-14 b9292e1e2d4ee1b461d7724a9d0f5ca27802ed70

 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); // 每X秒滚动一次
@@ -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>