From 6f251b714260edadcaf82fc7bcc4e7c40491d64f Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 20 八月 2024 18:04:45 +0800
Subject: [PATCH] update
---
src/views/ecg/room/RoomStatusSetting.vue | 6 ++++++
src/views/ecg/doctor/index.vue | 19 ++++++++++++-------
src/views/ecg/doctor/components/QueuePanel.vue | 2 +-
src/api/ecg/doctor/index.ts | 17 +++++++++++------
src/api/ecg/queue/index.ts | 6 ++++++
5 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/src/api/ecg/doctor/index.ts b/src/api/ecg/doctor/index.ts
index f6f9089..a2fdb31 100644
--- a/src/api/ecg/doctor/index.ts
+++ b/src/api/ecg/doctor/index.ts
@@ -8,14 +8,19 @@
// 鍖荤敓 API
export const DoctorApi = {
- // 涓嬩竴浣嶆偅鑰�
- nextPatient: async (params: RoomBedVO) => {
- return await request.get({ url: `/ecg/doctor/nextpatient`, params })
+ // 鐪嬪畬锛屽彇涓嬩竴浣嶆偅鑰�
+ finishNextPatient: async (params: RoomBedVO) => {
+ return await request.get({ url: `/ecg/doctor/finish-next-patient`, params })
},
- // 鐪嬪畬鎮ｈ��
- finishPatient: async (params: RoomBedVO) => {
- return await request.get({ url: `/ecg/doctor/finishpatient`, params })
+ // 杩囧彿锛屽彇涓嬩竴浣嶆偅鑰�
+ passNextPatient: async (params: RoomBedVO) => {
+ return await request.get({ url: `/ecg/doctor/pass-next-patient`, params })
+ },
+
+ // 鍙栧垵濮嬫偅鑰呭垪琛�
+ getPatientList: async (params: RoomBedVO) => {
+ return await request.get({ url: `/ecg/doctor/get-patient-list`, params })
}
}
diff --git a/src/api/ecg/queue/index.ts b/src/api/ecg/queue/index.ts
index 370cd2b..556cf28 100644
--- a/src/api/ecg/queue/index.ts
+++ b/src/api/ecg/queue/index.ts
@@ -52,5 +52,11 @@
// 鍒濆鍖栭槦鍒椾俊鎭紝鐢ㄤ簬寮�璇婅缃�
openingSetting: async () => {
return await request.get({ url: `/ecg/queue/opening-setting` })
+ },
+
+ // 寮�璇婂墠涓�鍒伙紝瀵瑰簲 灏辫瘖鍑嗗鐨勪汉鍛� 閲嶆柊鎺掑簭
+ queueReorder: async () => {
+ return await request.get({ url: `/ecg/queue/reorder` })
}
+
}
diff --git a/src/views/ecg/doctor/components/QueuePanel.vue b/src/views/ecg/doctor/components/QueuePanel.vue
index 5f3f26b..de30b75 100644
--- a/src/views/ecg/doctor/components/QueuePanel.vue
+++ b/src/views/ecg/doctor/components/QueuePanel.vue
@@ -25,7 +25,7 @@
<template>
<div v-for="(item, index) in queue" :key="index">
{{item.patName}}
- {{item.patGender==1 ? "鐢�" : "濂�"}}
+ <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="item.patGender" />
{{item.roomId}}
{{item.roomName}}
{{item.bedNo}}
diff --git a/src/views/ecg/doctor/index.vue b/src/views/ecg/doctor/index.vue
index 3189eb1..a62554d 100644
--- a/src/views/ecg/doctor/index.vue
+++ b/src/views/ecg/doctor/index.vue
@@ -14,19 +14,24 @@
const list = ref<queueVO[]>([])
-const nextPatient = async () => {
- const data = await DoctorApi.nextPatient(roomBedVO)
+const finishNextPatient = async () => {
+ const data = await DoctorApi.finishNextPatient(roomBedVO)
list.value = data
}
-const finishPatient = async () => {
- const data = await DoctorApi.finishPatient(roomBedVO)
+const passNextPatient = async () => {
+ const data = await DoctorApi.passNextPatient(roomBedVO)
+ list.value = data
+}
+
+const getPatientList = async () => {
+ const data = await DoctorApi.getPatientList(roomBedVO)
list.value = data
}
/** 鍒濆鍖� **/
onMounted(() => {
- nextPatient()
+ getPatientList()
})
</script>
@@ -45,8 +50,8 @@
</el-aside>
</el-container>
<el-container style="justify-content: center;">
- <el-button type="primary" @click="finishPatient">瀹屾垚</el-button>
- <el-button type="primary" @click="nextPatient">涓嬩竴浣�</el-button>
+ <el-button type="primary" @click="finishNextPatient">瀹屾垚涓嬩竴浣�</el-button>
+ <el-button type="primary" @click="passNextPatient">杩囧彿涓嬩竴浣�</el-button>
</el-container>
</el-container>
</template>
diff --git a/src/views/ecg/room/RoomStatusSetting.vue b/src/views/ecg/room/RoomStatusSetting.vue
index a4f9ed3..7df4705 100644
--- a/src/views/ecg/room/RoomStatusSetting.vue
+++ b/src/views/ecg/room/RoomStatusSetting.vue
@@ -5,6 +5,8 @@
</div>
</div>
<el-button @click="startUsing">鍚敤</el-button>
+
+ <el-button @click="queueReorder"> 闃熷垪閲嶆帓 </el-button>
</template>
<script setup lang="ts">
@@ -26,6 +28,10 @@
await queueApi.openingSetting();
}
+const queueReorder = async () => {
+ await queueApi.queueReorder();
+}
+
/** 鍒濆鍖� **/
onMounted(() => {
getList()
--
Gitblit v1.9.3