From 82ad6283a72a8269123042efe35563136b4839ef Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 13 十一月 2024 16:26:39 +0800
Subject: [PATCH] 过号-召回 update
---
src/views/ecg/doctor/DevInstall.vue | 2 +-
src/views/ecg/doctor/Routine.vue | 2 +-
src/views/ecg/doctor/index.vue | 2 +-
src/views/ecg/doctor/components/QueuePanel.vue | 15 ++++++++-------
src/api/ecg/doctor/index.ts | 5 ++++-
5 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/api/ecg/doctor/index.ts b/src/api/ecg/doctor/index.ts
index 2ccd312..0cdf94e 100644
--- a/src/api/ecg/doctor/index.ts
+++ b/src/api/ecg/doctor/index.ts
@@ -4,7 +4,7 @@
roomId: number | null // 璇婂缂栧彿
roomName: string | null
bedNo: string | null // 璇婄枟搴婄紪鍙�
- checkTypes: number[] | null,
+ checkTypes: number[] | null
opType: number | null
}
@@ -12,7 +12,10 @@
roomId: number // 璇婂缂栧彿
bedNo: string // 璇婄枟搴婄紪鍙�
patId: string // 鎮ｈ�呯紪鍙�
+ checkType: number // 妫�鏌ョ被鍨�
jumpFlag: number // 鎻掗槦鏍囪
+ roomId_operator: number
+ bedNo_operator: string
}
export interface PatientStatisticVO {
diff --git a/src/views/ecg/doctor/DevInstall.vue b/src/views/ecg/doctor/DevInstall.vue
index 0edafda..8191f25 100644
--- a/src/views/ecg/doctor/DevInstall.vue
+++ b/src/views/ecg/doctor/DevInstall.vue
@@ -180,7 +180,7 @@
<DevInstallPanel :room="roomBedVO" ref="devInstallPanelRef" @event_dev_install="onEventDevInstall"/>
</el-main>
<el-aside width="400px" style="border: solid var(--el-color-primary-light-7)">
- <QueuePanel :queue="patientList" @event_RecallFinish="onEventRecallFinish"/>
+ <QueuePanel :room="roomBedVO" :queue="patientList" @event_RecallFinish="onEventRecallFinish"/>
</el-aside>
</el-container>
<el-container class="right-bottom">
diff --git a/src/views/ecg/doctor/Routine.vue b/src/views/ecg/doctor/Routine.vue
index b0b8fc2..c79aa8b 100644
--- a/src/views/ecg/doctor/Routine.vue
+++ b/src/views/ecg/doctor/Routine.vue
@@ -178,7 +178,7 @@
<RoutinePanel :room="roomBedVO" ref="routimePanelRef" @event_routine="onEventRoutine"/>
</el-main>
<el-aside width="400px" style="border: solid var(--el-color-primary-light-7)">
- <QueuePanel :queue="patientList" @event_RecallFinish="onEventRecallFinish"/>
+ <QueuePanel :room="roomBedVO" :queue="patientList" @event_RecallFinish="onEventRecallFinish"/>
</el-aside>
</el-container>
<el-container class="right-bottom">
diff --git a/src/views/ecg/doctor/components/QueuePanel.vue b/src/views/ecg/doctor/components/QueuePanel.vue
index 98aa6b0..60ed25f 100644
--- a/src/views/ecg/doctor/components/QueuePanel.vue
+++ b/src/views/ecg/doctor/components/QueuePanel.vue
@@ -2,7 +2,7 @@
import {defineComponent, PropType} from "vue";
import { QueueVO } from '@/api/ecg/queue'
import {DICT_TYPE} from "@/utils/dict";
-import {PatientVO, DoctorApi} from "@/api/ecg/doctor";
+import {PatientVO, DoctorApi, RoomBedVO} from "@/api/ecg/doctor";
import {useCheckTypeStore} from "@/store/modules/checkType";
defineComponent({
@@ -19,13 +19,11 @@
queue: {
type: Array as PropType<QueueVO[]>,
required: true
- }
- /*,
- modelValue: {
- type: Object as PropType<RoomVO>,
+ },
+ room: {
+ type: Object as PropType<RoomBedVO>,
required: true
}
-*/
})
const recall = async (item) => {
@@ -33,7 +31,10 @@
roomId: item.roomId,
bedNo: item.bedNo,
patId: item.patId,
- jumpFlag: 0
+ checkType: item.bookCheckType,
+ jumpFlag: 0,
+ roomId_operator: props.room.roomId,
+ bedNo_operator: props.room.bedNo,
}
let data = ""
diff --git a/src/views/ecg/doctor/index.vue b/src/views/ecg/doctor/index.vue
index c0f8906..1a894ad 100644
--- a/src/views/ecg/doctor/index.vue
+++ b/src/views/ecg/doctor/index.vue
@@ -177,7 +177,7 @@
<DevReadyPanel :room="roomBedVO" ref="devReadyPanelRef" @event_dev_ready="onEventDevReady"/>
</el-main>
<el-aside width="400px" style="border: solid var(--el-color-primary-light-7)">
- <QueuePanel :queue="patientList" @event_RecallFinish="onEventRecallFinish"/>
+ <QueuePanel :room="roomBedVO" :queue="patientList" @event_RecallFinish="onEventRecallFinish"/>
</el-aside>
</el-container>
<el-container class="right-bottom">
--
Gitblit v1.9.3