From d14506241dbec4aff4355c6488c1da56d54ef0d0 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 14 十月 2024 18:51:34 +0800
Subject: [PATCH] 装机 过号 召回
---
src/views/ecg/doctor/DevInstall.vue | 11 +++++++----
src/views/ecg/doctor/components/QueuePanel.vue | 9 +++++++--
src/api/ecg/doctor/index.ts | 18 ++++++++++++++----
3 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/src/api/ecg/doctor/index.ts b/src/api/ecg/doctor/index.ts
index 040377d..2bac52d 100644
--- a/src/api/ecg/doctor/index.ts
+++ b/src/api/ecg/doctor/index.ts
@@ -69,6 +69,11 @@
return await request.get({ url: `/ecg/doctor/pass-next-patient`, params })
},
+ // 瑁呮満杩囧彿锛屽彇涓嬩竴浣嶆偅鑰�
+ passInstallNextPatient: async (params: RoomBedVO) => {
+ return await request.get({ url: `/ecg/doctor/pass-install-next-patient`, params })
+ },
+
// 閲嶅彨
callAgainPatient: async (params: RoomBedVO) => {
return await request.get({ url: `/ecg/doctor/call-again`, params })
@@ -79,9 +84,9 @@
return await request.get({ url: `/ecg/doctor/get-patient-list`, params })
},
- // 鍙� 宸查鐢� 鎮ｈ�呭垪琛�
- getReceivedPatientList: async (params: RoomBedVO) => {
- return await request.get({ url: `/ecg/doctor/get-received-patient-list`, params })
+ // 鍙� [寰呰鏈篯 鎮ｈ�呭垪琛�
+ getToBeInstalledPatientList: async (params: RoomBedVO) => {
+ return await request.get({ url: `/ecg/doctor/get-to-be-installed-list`, params })
},
// 鍙栨偅鑰呯粺璁�
@@ -104,7 +109,12 @@
return await request.get({ url: `/ecg/doctor/recall-patient`, params })
},
- // 鍙洖杩囧彿鎮ｈ��
+ // 鍙洖 瀹夎杩囧彿 鎮ｈ��
+ recallInstallPatient: async (params: PatientVO) => {
+ return await request.get({ url: `/ecg/doctor/recall-install-patient`, params })
+ },
+
+ // 鍔犳�ユ偅鑰�
patientJump: async (params: PatientVO) => {
return await request.get({ url: `/ecg/doctor/patient-jump`, params })
}
diff --git a/src/views/ecg/doctor/DevInstall.vue b/src/views/ecg/doctor/DevInstall.vue
index 7f73c91..b9b59cb 100644
--- a/src/views/ecg/doctor/DevInstall.vue
+++ b/src/views/ecg/doctor/DevInstall.vue
@@ -1,5 +1,5 @@
<script setup lang="ts">
-import TitleInstallPanel from "@/views/ecg/doctor/components/TitleInstallPanel.vue";
+import TitlePanel from "@/views/ecg/doctor/components/TitlePanel.vue";
import DevInstallPanel from "@/views/ecg/doctor/components/DevInstallPanel.vue";
import QueuePanel from "@/views/ecg/doctor/components/QueuePanel.vue";
import {DoctorApi, PatientStatisticVO, RoomBedVO} from '@/api/ecg/doctor';
@@ -43,6 +43,9 @@
patientList.value = await DoctorApi.finishInstallNextPatient(roomBedVO.value)
patientStat.value = await DoctorApi.getDevInstallStatistic(roomBedVO.value)
getInstallingPatient()
+
+ // 鐢ㄤ簬瑙ｅ喅 宸︿晶閲嶇疆鍚� 鑾峰彇褰撳墠 銆愬畨瑁呬腑銆戞偅鑰�
+ setInstallingPatient(installingPatient.value)
} finally {
finishFlag.value = false
}
@@ -51,7 +54,7 @@
const passNextPatient = async () => {
passFlag.value = true
try {
- patientList.value = await DoctorApi.passNextPatient(roomBedVO.value)
+ patientList.value = await DoctorApi.passInstallNextPatient(roomBedVO.value)
patientStat.value = await DoctorApi.getDevInstallStatistic(roomBedVO.value)
getInstallingPatient()
} finally {
@@ -66,7 +69,7 @@
const getInstallingPatient = () => {
const tempPatient : QueueVO | undefined = patientList.value.find(item => item.status === 36)
if (undefined === tempPatient) {
- setInstallingPatient(undefined)
+ //setInstallingPatient(undefined)
} else if (tempPatient.patId !== installingPatient.value.patId) {
installingPatient.value= tempPatient
setInstallingPatient(tempPatient)
@@ -83,7 +86,7 @@
return
}
- patientList.value = await DoctorApi.getReceivedPatientList(roomBedVO.value)
+ patientList.value = await DoctorApi.getToBeInstalledPatientList(roomBedVO.value)
getInstallingPatient()
patientStat.value = await DoctorApi.getDevInstallStatistic(roomBedVO.value)
const queueVO2 = await DoctorApi.bedDoctorGet(roomBedVO.value)
diff --git a/src/views/ecg/doctor/components/QueuePanel.vue b/src/views/ecg/doctor/components/QueuePanel.vue
index f55d1a2..b2d8412 100644
--- a/src/views/ecg/doctor/components/QueuePanel.vue
+++ b/src/views/ecg/doctor/components/QueuePanel.vue
@@ -33,7 +33,12 @@
jumpFlag: 0
}
- const data = await DoctorApi.recallPatient(patientVO);
+ let data = ""
+ if (item.status === 5)
+ data = await DoctorApi.recallPatient(patientVO);
+ else if (item.status === 7)
+ data = await DoctorApi.recallInstallPatient(patientVO);
+
emit("event_RecallFinish")
message.info(data)
}
@@ -47,7 +52,7 @@
<!-- {{item.roomName}} {{item.bedNo}}-->
<dict-tag :type="DICT_TYPE.ECG_CHECK_TYPE" :value="item.bookCheckType" />
<dict-tag :type="DICT_TYPE.ECG_QUEUE_STATUS" :value="item.status" />
- <el-button v-if="item.status === 5" @click="recall(item)"> 鍙洖 </el-button>
+ <el-button v-if="item.status === 5 || item.status === 7" @click="recall(item)"> 鍙洖 </el-button>
</div>
</template>
--
Gitblit v1.9.3