From d553a4be94d4f6ee162cc353a28b220403909cfc Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期六, 03 十月 2026 00:58:19 +0800
Subject: [PATCH] ai优化
---
src/views/ecg/doctor/Routine.vue | 107 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 73 insertions(+), 34 deletions(-)
diff --git a/src/views/ecg/doctor/Routine.vue b/src/views/ecg/doctor/Routine.vue
index 5b1db4c..e7c327c 100644
--- a/src/views/ecg/doctor/Routine.vue
+++ b/src/views/ecg/doctor/Routine.vue
@@ -7,6 +7,7 @@
import TitlePanel from '@/views/ecg/doctor/components/TitlePanel.vue'
import QueuePanel from '@/views/ecg/doctor/components/QueuePanel.vue'
+import DoctorPageLayout from '@/components/DoctorPageLayout/src/DoctorPageLayout.vue'
import { DoctorApi, PatientStatisticVO, RoomBedVO, } from '@/api/ecg/doctor'
import { QueueVO } from '@/api/ecg/queue'
import { ElMessage, ElMessageBox, ElNotification } from 'element-plus'
@@ -129,8 +130,8 @@
}
try {
await ElMessageBox.confirm(
- `纭畾鎾ら攢銆�${last.patName || last.patId}銆嶇殑妫�鏌ュ畬鎴愬悧锛熻鎮h�呭皢鍥炲埌鍊欒瘖鍖恒�俙,
- '鎾ら攢妫�鏌ュ畬鎴�',
+ `纭畾鎾ら攢銆�${last.patName || last.patId}銆嶇殑銆屽畬鎴愩�嶇姸鎬佸悧锛熻鎮h�呭皢鍥炲埌鍊欒瘖鍖恒�俙,
+ '鎾ら攢',
{ type: 'warning', confirmButtonText: '纭畾鎾ら攢', cancelButtonText: '鍙栨秷' }
)
} catch {
@@ -143,7 +144,7 @@
patId: last.patId,
checkType: last.bookCheckType
} as any)
- ElMessage.success(msg || '宸叉挙閿�妫�鏌ュ畬鎴�')
+ ElMessage.success(msg || '宸叉挙閿�')
await initLoad()
} finally {
undoFlag.value = false
@@ -170,6 +171,35 @@
try {
patientList.value = await DoctorApi.passNextPatient(roomBedVO)
patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO)
+
+ // ========================================================================
+ // 銆愪慨澶嶃�戣繃鍙峰悗鍚屾牱瑕�**娓呯┖宸︿笂鏂规偅鑰呬俊鎭�**锛岃〃绀哄彲浠ュ彨涓嬩竴浣嶄簡銆�
+ //
+ // 鍘熷厛鍙皟 getOnstagePatient()锛岃�岃鏂规硶鍦ㄦ壘涓嶅埌 status===30 鐨勬偅鑰呮椂
+ // **浠�涔堥兘涓嶅仛**锛堝畠鍐呴儴閭h setOnStagePatient(undefined) 鏄娉ㄩ噴鎺夌殑锛夛紝
+ // 浜庢槸杩囧彿鍚庡乏涓婅浠嶇暀鐫�涓婁竴浣嶆偅鑰呯殑淇℃伅锛屽尰鐢熶細浠ヤ负杩樺湪澶勭悊浠栥��
+ // 杩欓噷涓庛�屾鏌ュ畬鎴愩��(onEventRoutine) 淇濇寔涓�鑷寸殑鏀跺熬鍔ㄤ綔銆�
+ // ========================================================================
+ onStagePatient = {
+ id: 0,
+ patId: '',
+ patName: '',
+ patGender: 0,
+ bookTimeslot: 0,
+ bookCheckType: 0,
+ isVip: 0,
+ seqNum: 0,
+ bookSeqNum: 0,
+ passed: 0,
+ expired: 0,
+ jumpFlag: 0,
+ roomId: 0,
+ roomName: '',
+ bedNo: '',
+ status: 0
+ }
+ routimePanelRef.value?.setPatient(undefined)
+
getOnstagePatient()
} finally {
passFlag.value = false
@@ -313,23 +343,37 @@
</script>
<template>
- <el-container>
- <el-header style="background-color: var(--el-color-primary-light-7); font-size: 24px">
+ <!--
+ 甯冨眬浼樺寲锛氬姛鑳芥寜閽浐瀹氬湪椤甸潰搴曢儴锛屼笉鍐嶇敤 position:absolute 娴湪鍐呭涓娿��
+ 路 鏍囬鏍忓浐瀹氬湪椤堕儴
+ 路 涓棿鍖猴紙鎮h�呬俊鎭� + 宸插畬鎴愯褰曞垪琛級涓烘粴鍔ㄥ尯锛屾偅鑰呬俊鎭敱 RoutinePanel 鍐呴儴璁句负
+ sticky 閽夊湪椤堕儴锛屽彧鏈夎褰曞垪琛ㄦ粴鍔�
+ 路 鍙充晶鎮h�呴槦鍒楃嫭绔嬫粴鍔�
+ 路 銆屽彨鍙�/杩囧彿/閲嶅彨/鏆傚仠/鎾ら攢鍙彿銆嶇瓑鎸夐挳杩� #footer锛屽浐瀹氬湪搴曢儴锛屾案涓嶈璁板綍鍒楄〃閬尅
+ 璇﹁ components/DoctorPageLayout銆�
+ -->
+ <DoctorPageLayout>
+ <template #header>
<TitlePanel :titleType="0" :room="roomBedVO" :patientStatistic="patientStat" />
- </el-header>
- <el-container style="height: 100%">
- <el-main style="border: solid var(--el-color-primary-light-7)">
- <RoutinePanel :room="roomBedVO" :setappointmentId="setappointmentId" ref="routimePanelRef" @event_routine="onEventRoutine" />
- </el-main>
- <el-aside width="400px" style="border: solid var(--el-color-primary-light-7)">
- <QueuePanel
- :room="roomBedVO"
- :queue="patientList"
- @event_RecallFinish="onEventRecallFinish"
- />
- </el-aside>
- </el-container>
- <el-container class="right-bottom">
+ </template>
+
+ <RoutinePanel
+ :room="roomBedVO"
+ :setappointmentId="setappointmentId"
+ ref="routimePanelRef"
+ :undo-disabled="undoFlag"
+ :undo-loading="undoFlag"
+ @event_routine="onEventRoutine"
+ @event_undo_finish="undoFinish"
+ />
+
+ <template #aside>
+ <QueuePanel :room="roomBedVO" :queue="patientList" @event_RecallFinish="onEventRecallFinish" />
+ </template>
+
+ <!-- 搴曢儴鎺т欢锛氳嚜鍔� + 鍔熻兘鎸夐挳 + 鍋滄鍊欒瘖锛屾暣缁勯潬鍙� -->
+ <template #footer>
+ <!-- 鑷姩 澶嶉�夋 -->
<el-checkbox label="鑷姩 " v-model="autoCall" />
<el-button :disabled="finishFlag" type="primary" @click="finishNextPatient">鍙彿</el-button>
<el-button :disabled="passFlag" type="primary" @click="passNextPatient">杩囧彿</el-button>
@@ -344,23 +388,18 @@
active-text="鍋滄鍊欒瘖"
inactive-text="姝e父鎺ヨ瘖"
inline-prompt
- style="margin-left: 12px; --el-switch-on-color: #e6a23c"
+ style="--el-switch-on-color: #e6a23c"
@change="onStopReadyChange"
/>
- <!-- 闇�姹�2锛氭挙閿�璇偣鍙彿 / 鎾ら攢妫�鏌ュ畬鎴愶紙鍧囧洖鍒板�欒瘖鍖猴級 -->
+ <!-- 闇�姹�2锛氭挙閿�璇偣鍙彿锛堝洖鍒板�欒瘖鍖猴級銆�
+ 闇�姹�11锛氥�屾挙閿�瀹屾垚銆嶅凡鏀瑰悕涓恒�屾挙閿�銆嶏紝骞剁Щ鍒般�屽凡瀹屾垚妫�鏌ヨ褰曞垪琛ㄣ�嶇殑鏈�鍓嶉潰銆� -->
<el-button :disabled="undoFlag" type="warning" plain @click="undoCall">鎾ら攢鍙彿</el-button>
- <el-button :disabled="undoFlag" type="warning" plain @click="undoFinish">鎾ら攢瀹屾垚</el-button>
- </el-container>
- </el-container>
+ </template>
+ </DoctorPageLayout>
</template>
-<style scoped lang="scss">
-.right-bottom {
- position: absolute;
- bottom: 50px;
- right: 80px;
- //background-color: #f00;
- //color: #fff;
- //padding: 10px;
-}
-</style>
+<!--
+ 鍘熷厛杩欓噷鏈� .right-bottom { position:absolute; bottom:50px; right:80px }锛�
+ 姝f槸"璁板綍鍒楄〃鍙橀暱鍚庣洊浣忓姛鑳芥寜閽�"鐨勬牴鍥狅紙鎸夐挳鑴辩鏂囨。娴併�佷笉鍗犲竷灞�绌洪棿锛夈��
+ 鐜版敼鐢� DoctorPageLayout 鐨� #footer 鎵胯浇锛氭甯告枃妗f祦涓殑鍥哄畾搴曟爮锛屾棤闇�鍋忕Щ銆�
+-->
--
Gitblit v1.9.3