From 1446994d504819c367e1ff667360eadb314f9ac6 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期日, 18 十月 2026 16:52:18 +0800
Subject: [PATCH] 修改了诊室工号
---
src/views/ecg/doctor/Routine.vue | 140 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 132 insertions(+), 8 deletions(-)
diff --git a/src/views/ecg/doctor/Routine.vue b/src/views/ecg/doctor/Routine.vue
index e7c327c..5545c0b 100644
--- a/src/views/ecg/doctor/Routine.vue
+++ b/src/views/ecg/doctor/Routine.vue
@@ -16,13 +16,19 @@
const roomStore = useRoomStore()
-const roomBedVO: RoomBedVO = {
+/**
+ * 褰撳墠宸ヤ綅淇℃伅銆�
+ *
+ * 銆愭湰娆¢渶姹傘�戝繀椤绘槸**鍝嶅簲寮�**瀵硅薄锛氬垏鎹㈠伐浣嶆椂椤甸潰浼氭妸瀹冩敼鎴愭柊宸ヤ綅鐨勫�硷紝
+ * 鑻ユ槸鏅�氬璞★紝宸ヤ綅鍚嶇О/妫�鏌ラ」鐩瓑鏄剧ず涓嶄細閲嶇粯锛堢湅璧锋潵鍍�"娌℃崲杩囨潵"锛夈��
+ */
+const roomBedVO = reactive<RoomBedVO>({
roomId: null,
roomName: null,
bedNo: null,
checkTypes: null,
opType: null
-}
+})
const setappointmentId = ref<string>('');
let onStagePatient: QueueVO = {
id: 0,
@@ -55,6 +61,10 @@
const state = ref<boolean>()
const patientList = ref<QueueVO[]>([])
+/** 銆愭湰璇婂鏈垎閰嶃�戞湰宸ヤ綅妫�鏌ョ被鍨嬩笅銆佽繕娌″垎閰嶅伐浣嶇殑"鎺掗槦涓�"鎮h�咃紙鍙墜宸ユ媺鍏ワ級 */
+const roomWaitingList = ref<QueueVO[]>([])
+/** 銆愯嚜鍔╄瘖鏂�戞渶杩戜竴娆″彇鏁扮殑璇存槑锛堢┖鍒楄〃鏃舵樉绀猴級 */
+const fetchInfo = ref('')
let timerRunFlag: boolean = false
const bedControlFlag = ref<boolean>(true)
@@ -145,6 +155,8 @@
checkType: last.bookCheckType
} as any)
ElMessage.success(msg || '宸叉挙閿�')
+ // 銆愭挙閿�鏍囪瘑銆戞挙閿�鍚庣珛鍒诲埛鏂般�屽凡瀹屾垚璁板綍銆嶅垪琛紝璁╄繖鏉¤褰曟樉绀烘垚銆屽凡鎾ら攢銆�
+ routimePanelRef.value?.getList?.()
await initLoad()
} finally {
undoFlag.value = false
@@ -220,6 +232,75 @@
}
}
+/**
+ * 銆愭湰璇婂鏈垎閰嶃�戝姞杞�"鏈伐浣嶆鏌ョ被鍨嬩笅銆佽繕娌″垎閰嶅伐浣嶇殑鎺掗槦涓偅鑰�"銆�
+ *
+ * 鍊欒瘖鍒楄〃鎸� room_id + bed_no 鏌ワ紝鍙惈宸插垎娴佸埌鏈伐浣嶇殑浜猴紱鑰�"鎺掗槦涓�(10)"鐨勪汉 bed_no 涓虹┖
+ * 锛堝ぇ灞忎細鏄剧ず銆佸伐浣滃彴鍘熷厛鐪嬩笉鍒帮級鈥斺�旂幇鍦哄弽棣堢殑"鎮h�呭垪琛ㄦ病鍙栧埌鎮h�呬俊鎭�"灏辨槸杩欎釜銆�
+ * 杩欓噷鎶婁粬浠崟鐙彇鍥炴潵灞曠ず锛屽伐浣嶄富浜哄彲涓�閿�屾媺鍏ャ�嶃��
+ *
+ * 澶辫触涓嶅奖鍝嶄富娴佺▼锛堝彧鎵撴棩蹇楋級锛氳繖涓尯鍧楀彧鎻愪緵渚垮埄锛屼笉鏄繀闇�鏁版嵁銆�
+ */
+const loadRoomWaitingList = async () => {
+ if (roomBedVO.roomId == null) return
+ try {
+ roomWaitingList.value = (await DoctorApi.getRoomWaitingList(roomBedVO)) || []
+ } catch (e) {
+ console.warn('[loadRoomWaitingList] 鍙栨湰璇婂鏈垎閰嶆偅鑰呭け璐�', e)
+ }
+}
+
+/** 銆屾媺鍏ャ�嶏細鎶婃帓闃熶腑鐨勬偅鑰呮墜宸ュ垎鍒版湰宸ヤ綅锛堝悗绔牎楠岋細蹇呴』鏄湰宸ヤ綅涓讳汉 + 妫�鏌ラ」鐩尮閰嶏級 */
+const onEventPullWaiting = async (item: any) => {
+ try {
+ await ElMessageBox.confirm(
+ `鎶娿��${item.patName || ''}銆嶆媺鍏ユ湰宸ヤ綅锛�${roomBedVO.roomName || ''} ${roomBedVO.bedNo || ''}锛夛紵`,
+ '鎷夊叆鎺掗槦鎮h��',
+ { confirmButtonText: '鎷夊叆', cancelButtonText: '鍙栨秷', type: 'warning' }
+ )
+ } catch {
+ return
+ }
+ try {
+ const data = await DoctorApi.pullWaitingPatient({
+ roomId: roomBedVO.roomId,
+ bedNo: roomBedVO.bedNo,
+ id: item.id
+ })
+ if (data !== 'success' && data !== undefined && data !== null && data !== '') {
+ // 鍚庣閿欒鐮佷細鎶涘嚭寮傚父锛堝"宸茶鍏朵粬宸ヤ綅鎷夊叆"锛夛紝璧板埌杩欓噷鐨勬甯歌繑鍥炴槸 success
+ console.warn('[onEventPullWaiting] 杩斿洖锛�', data)
+ }
+ ElMessage.success(`宸叉妸銆�${item.patName || ''}銆嶆媺鍏ユ湰宸ヤ綅`)
+ } catch (e) {
+ // 鎺ュ彛寮傚父锛堝惈閿欒鐮佹彁绀猴級鐢卞叏灞�鎷︽埅鍣ㄦ彁绀猴紝杩欓噷鍙渶鍒锋柊鍒楄〃
+ console.warn('[onEventPullWaiting] 鎷夊叆澶辫触', e)
+ }
+ await initLoad()
+}
+
+/**
+ * 銆岀珛鍗宠ˉ浜恒�嶏細鎵嬪姩瑙﹀彂涓�娆℃湰宸ヤ綅鐨勮嚜鍔ㄥ垎娴侊紝骞舵妸鍚庣杩斿洖鐨�"涓轰粈涔堟病琛�/琛ヤ簡鍑犱汉"灞曠ず鍑烘潵銆�
+ *
+ * 绯荤粺鍙湪銆愬紑璇娿�戙�佹湰宸ヤ綅鏈紑銆愬仠姝㈠�欒瘖銆戙�佸�欒瘖浜烘暟鏈揪涓婇檺鏃舵墠浼氳嚜鍔ㄨˉ浜猴紱
+ * 杩欎笁閬撻棬闂稿師鍏堥兘鏄潤榛樼殑锛岀幇鍦哄彧鑳界湅鍒�"鎺掗槦鐨勪汉灏辨槸涓嶈繘鍊欒瘖鍖�"銆�
+ */
+const onEventHurryUp = async () => {
+ try {
+ const data: any = await DoctorApi.hurryUpNow(roomBedVO)
+ const lines = Object.entries(data || {})
+ .map(([k, v]) => `${k}锛�${v === null || v === undefined || v === '' ? '锛堢┖锛�' : v}`)
+ .join('\n')
+ await ElMessageBox.alert(lines, '绔嬪嵆琛ヤ汉 路 璇婃柇缁撴灉', {
+ confirmButtonText: '鐭ラ亾浜�',
+ type: data?.鏈琛ュ叆 > 0 ? 'success' : 'warning'
+ })
+ } catch (e: any) {
+ ElMessage({ message: '绔嬪嵆琛ヤ汉澶辫触锛�' + (e?.message || e), type: 'warning', duration: 4000 })
+ }
+ await initLoad()
+}
+
const initLoad = async () => {
if (roomBedVO.roomId == null) {
ElNotification.error({
@@ -230,12 +311,17 @@
return
}
- patientList.value = await DoctorApi.getToBeCheckedPatientList(roomBedVO)
+ patientList.value = (await DoctorApi.getToBeCheckedPatientList(roomBedVO)) || []
+ // 銆愯嚜鍔╄瘖鏂�戣褰曟湰娆″彇鏁版椂闂翠笌鏉℃暟锛堢┖鍒楄〃鏃舵樉绀猴紝渚夸簬鍖哄垎"杞娌¤窇/鍚庣娌℃暟鎹�"锛�
+ fetchInfo.value = `鏈�杩戝彇鏁� ${new Date().toLocaleTimeString()} 路 杩斿洖 ${patientList.value.length} 鏉
+ // 銆愭湰璇婂鏈垎閰嶃�戞湰宸ヤ綅妫�鏌ョ被鍨嬩笅銆佽繕娌″垎閰嶅伐浣嶇殑"鎺掗槦涓�"鎮h�咃紙鍙墜宸ユ媺鍏ワ級
+ loadRoomWaitingList()
getOnstagePatient()
patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO)
const queueVO2 = await DoctorApi.bedDoctorGet(roomBedVO)
- if (queueVO2.status === 20) state.value = true
- else if (queueVO2.status === 30) state.value = false
+ // 銆愬姞鍥恒�戞帴鍙e彲鑳借繑鍥� null锛屽師鏉ョ洿鎺ュ彇 .status 浼氭姏寮傚父銆佷腑鏂湰杞悗缁楠�
+ if (queueVO2 && queueVO2.status === 20) state.value = true
+ else if (queueVO2 && queueVO2.status === 30) state.value = false
// 闇�姹�3锛氬悓姝�"鍋滄鍊欒瘖"寮�鍏崇姸鎬侊紙鍏朵粬鍖荤敓/鍏朵粬缁堢鏀瑰姩鍚庢湰绔篃鑳界湅鍒帮級
await loadStopReady()
}
@@ -257,9 +343,43 @@
const doctorTimer = () => {
console.log('doctorTimer ...')
- initLoad()
+ // 銆愬姞鍥恒�戝崟杞彇鏁板け璐ヤ笉鑳藉彉鎴� unhandled rejection锛�
+ // 鍘熸潵鐩存帴 `initLoad()`锛堜笉 await銆佷笉 catch锛夛紝涓�鏃︽煇杞帴鍙e紓甯革紝閿欒琚悶鎺夈��
+ // 椤甸潰鍋滃湪鏃ф暟鎹紙鐜板満琛ㄧ幇灏辨槸"鎮h�呭垪琛ㄤ竴鐩存槸绌虹殑"锛岃�屽簱閲屾湁鎮h�咃級銆�
+ initLoad().catch((e) => console.error('[doctorTimer] 鏈疆鍙栨暟澶辫触锛堝凡蹇界暐锛屼笅涓�杞户缁級', e))
if (timerRunFlag) setTimeout(doctorTimer, 5000) // five seconds
}
+
+/**
+ * 銆愪富/鍥磋銆戣窡闅� store 鍒囨崲"姝e湪鏌ョ湅鐨勫伐浣�"銆�
+ *
+ * roomBedVO 鍘熸潵鍙湪 onMounted 鏃朵粠 store 鎷蜂竴娆� 鈫� 鐢ㄩ《閮ㄣ�屽伐浣嶃�嶄笅鎷夊垏鍒板埆鐨勪汉宸ヤ綅锛堝洿瑙傦級鍚庯紝
+ * 鏈〉鏁版嵁涓嶄細璺熺潃鍙橈紝蹇呴』鍒锋柊椤甸潰鎵嶇敓鏁堛�傝繖閲� watch 涓�涓嬪嵆鍙嵆鏃剁敓鏁�
+ * 锛堝彇鏁板畾鏃跺櫒浼氱珛鍒绘媺鍒版柊宸ヤ綅鐨勬暟鎹級銆�
+ */
+watch(
+ () => [roomStore.room?.roomId, roomStore.room?.bedNo],
+ async () => {
+ if (!roomStore.room) return
+ roomBedVO.roomId = roomStore.room.roomId
+ roomBedVO.roomName = roomStore.room.roomName
+ roomBedVO.bedNo = roomStore.room.bedNo
+ roomBedVO.checkTypes = roomStore.room.checkTypes
+ roomBedVO.opType = roomStore.room.opType
+ // 銆愭湰娆¢渶姹傘�戞崲宸ヤ綅鍚�**鏁撮〉鏁版嵁閮芥崲鎴愭柊宸ヤ綅鐨�**锛�
+ // 鈶� 鍏堟竻绌哄乏渚�"鎮h�呬俊鎭�"锛堥伩鍏嶈繕鏄剧ず涓婁竴涓伐浣嶇殑鎮h�咃級
+ routimePanelRef.value?.setPatient?.(undefined)
+ // 鈶� 鍚姩/缁х画鍙栨暟瀹氭椂鍣紙鍊欒瘖鍒楄〃銆佺粺璁°�佸綋鍓嶅彨鍙锋偅鑰呫�佸仠姝㈠�欒瘖寮�鍏抽兘浼氬埛鏂帮級
+ if (!timerRunFlag && roomBedVO.roomId != null) {
+ timerRunFlag = true
+ doctorTimer()
+ } else if (roomBedVO.roomId != null) {
+ await initLoad()
+ }
+ // 鈶� 鍒锋柊銆屽凡瀹屾垚鍒楄〃銆嶏紙闈㈡澘鍐呬細鎸夋柊宸ヤ綅鐨� checkTypes 閲嶆柊杩囨护锛�
+ routimePanelRef.value?.getList?.()
+ }
+)
/** 鍒濆鍖� **/
onMounted(() => {
@@ -352,7 +472,7 @@
路 銆屽彨鍙�/杩囧彿/閲嶅彨/鏆傚仠/鎾ら攢鍙彿銆嶇瓑鎸夐挳杩� #footer锛屽浐瀹氬湪搴曢儴锛屾案涓嶈璁板綍鍒楄〃閬尅
璇﹁ components/DoctorPageLayout銆�
-->
- <DoctorPageLayout>
+ <DoctorPageLayout :bed-switch-op-types="[0]">
<template #header>
<TitlePanel :titleType="0" :room="roomBedVO" :patientStatistic="patientStat" />
</template>
@@ -368,7 +488,11 @@
/>
<template #aside>
- <QueuePanel :room="roomBedVO" :queue="patientList" @event_RecallFinish="onEventRecallFinish" />
+ <QueuePanel :room="roomBedVO" :queue="patientList" :waiting-list="roomWaitingList"
+ :fetch-info="fetchInfo"
+ @event_RecallFinish="onEventRecallFinish"
+ @event_PullWaiting="onEventPullWaiting"
+ @event_HurryUp="onEventHurryUp" />
</template>
<!-- 搴曢儴鎺т欢锛氳嚜鍔� + 鍔熻兘鎸夐挳 + 鍋滄鍊欒瘖锛屾暣缁勯潬鍙� -->
--
Gitblit v1.9.3