From 49206ee0689d44367b9f5de3decf0c3ec02bfb51 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 15 四月 2025 10:56:18 +0800
Subject: [PATCH] update
---
src/views/ecg/doctor/index.vue | 22 ++++++-----
src/api/ecg/doctor/index.ts | 10 ++--
src/api/ecg/queue/index.ts | 38 +++++++++---------
src/views/ecg/doctor/components/DevInstallPanel.vue | 1
src/views/ecg/doctor/components/DevReadyPanel.vue | 13 ++----
5 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/src/api/ecg/doctor/index.ts b/src/api/ecg/doctor/index.ts
index 40e43b2..f41ab61 100644
--- a/src/api/ecg/doctor/index.ts
+++ b/src/api/ecg/doctor/index.ts
@@ -26,11 +26,11 @@
}
export interface PatientStatisticVO {
- finishedNum: number
- readyNum: number
- receivedNum: number
- passedNum: number
- queuingNum: number
+ finishedNum?: number
+ readyNum?: number
+ receivedNum?: number
+ passedNum?: number
+ queuingNum?: number
}
// 鍖荤敓 API
diff --git a/src/api/ecg/queue/index.ts b/src/api/ecg/queue/index.ts
index f089791..5a74418 100644
--- a/src/api/ecg/queue/index.ts
+++ b/src/api/ecg/queue/index.ts
@@ -3,25 +3,25 @@
// 鎺掗槦 VO
export interface QueueVO {
- id: number // id
- applyNo: string // 棰勭害鐢宠鍙�
- episodeId: string // 灏辫瘖娴佹按鍙�
- patId: string // 鎮ｈ�呯紪鍙�
- patName: string // 鎮ｈ�呭鍚�
- patGender: number // 鎮ｈ�呮�у埆
- bookTimeslot: number // 棰勭害鏃堕棿娈�
- bookCheckType: number // 棰勭害妫�鏌ョ被鍨�
- bookSeqNum: number //棰勭害搴忓彿
- isVip: number // 鏄惁VIP鎮ｈ��
- seqNum: number // 鎺掗槦搴忓彿
- status: number // 5:杩囧彿 10:鎺掗槦涓� 15:宸插彫鍥� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚
- passed: number // 杩囧彿鏍囪
- expired: number // 棰勭害杩囨湡鏍囪
- jumpFlag: number //鎻掗槦鏍囪
- roomId: number // 璇婂缂栧彿
- roomName: string // 璇婂鍚嶇О
- bedNo: string // 璇婄枟搴婄紪鍙�
- patDetails: PatDetailsVO
+ id?: number // id
+ applyNo?: string // 棰勭害鐢宠鍙�
+ episodeId?: string // 灏辫瘖娴佹按鍙�
+ patId?: string // 鎮ｈ�呯紪鍙�
+ patName?: string // 鎮ｈ�呭鍚�
+ patGender?: number // 鎮ｈ�呮�у埆
+ bookTimeslot?: number // 棰勭害鏃堕棿娈�
+ bookCheckType?: number // 棰勭害妫�鏌ョ被鍨�
+ bookSeqNum?: number //棰勭害搴忓彿
+ isVip?: number // 鏄惁VIP鎮ｈ��
+ seqNum?: number // 鎺掗槦搴忓彿
+ status?: number // 5:杩囧彿 10:鎺掗槦涓� 15:宸插彫鍥� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚
+ passed?: number // 杩囧彿鏍囪
+ expired?: number // 棰勭害杩囨湡鏍囪
+ jumpFlag?: number //鎻掗槦鏍囪
+ roomId?: number // 璇婂缂栧彿
+ roomName?: string // 璇婂鍚嶇О
+ bedNo?: string // 璇婄枟搴婄紪鍙�
+ patDetails?: PatDetailsVO
}
// 鎺掗槦 API
diff --git a/src/views/ecg/doctor/components/DevInstallPanel.vue b/src/views/ecg/doctor/components/DevInstallPanel.vue
index 42ffc05..9dc5525 100644
--- a/src/views/ecg/doctor/components/DevInstallPanel.vue
+++ b/src/views/ecg/doctor/components/DevInstallPanel.vue
@@ -231,6 +231,7 @@
baseline: undefined,
detachment: undefined,
remark: undefined,
+ checkType: undefined,
}
formRef.value?.resetFields()
devInfo.value = {
diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index f846a23..b06dfca 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -166,15 +166,13 @@
const { t } = useI18n() // 鍥介檯鍖�
const message = useMessage() // 娑堟伅寮圭獥
-const dialogVisible = ref(false) // 寮圭獥鐨勬槸鍚﹀睍绀�
-
const formLoading = ref(false) // 琛ㄥ崟鐨勫姞杞戒腑锛�1锛変慨鏀规椂鐨勬暟鎹姞杞斤紱2锛夋彁浜ょ殑鎸夐挳绂佺敤
const autoPrint = ref<boolean>(true);
const checkTypeStore = useCheckTypeStore()
-const formData = ref<Partial<DevRentVO>>({
+const formData = ref<DevRentVO>({
id: undefined,
devId: undefined,
patId: undefined,
@@ -248,12 +246,11 @@
feeConfirm()
}
- dialogVisible.value = false
- // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
- emit('event_dev_ready')
resetForm()
getList()
+ // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
+ emit('event_dev_ready')
message.success(t('鎿嶄綔瀹屾垚'))
} finally {
formLoading.value = false
@@ -305,7 +302,7 @@
formData.value.patId = queueVO?.patId
formData.value.patName = queueVO?.patName
formData.value.checkType = queueVO?.bookCheckType
- getFreeRentInfo(formData.value)
+ getFreeRentInfo(formData.value) // 寰呮鏌ョ殑淇℃伅 @ dev_rent 琛�
copyBarcode()
}
defineExpose({ setPatient }) // 鎻愪緵 setPatient 鏂规硶锛岀敤浜庤缃偅鑰�
@@ -360,7 +357,7 @@
const printBill = async (patId: string, checkType: number, printMode?: number) => {
const curAppointment: AppointmentVO = await AppointmentApi.getCurAppointmentByPatIdAndCheckType( patId, checkType )
- console.info( curAppointment )
+ //console.info( curAppointment )
// 寮曞叆鍚庝娇鐢ㄧず渚�
hiprint.init({
diff --git a/src/views/ecg/doctor/index.vue b/src/views/ecg/doctor/index.vue
index b29a0c2..52e210f 100644
--- a/src/views/ecg/doctor/index.vue
+++ b/src/views/ecg/doctor/index.vue
@@ -18,10 +18,10 @@
opType: null
}
-const onStagePatient = ref<QueueVO>({
+let onStagePatient: QueueVO = {
bedNo: "", bookCheckType: 0, bookTimeslot: 0, expired: 0, id: 0, jumpFlag: 0, passed: 0,
patGender: 0, patId: "", patName: "", roomId: 0, roomName: "", seqNum: 0, status: 0
-})
+}
const patientStat = ref<PatientStatisticVO>({
finishedNum: 0,
@@ -48,7 +48,7 @@
getOnstagePatient()
// 鐢ㄤ簬瑙ｅ喅 宸︿晶閲嶇疆鍚� 鑾峰彇褰撳墠 銆愬氨璇婁腑銆戞偅鑰�
- setOnStagePatient(onStagePatient.value)
+ setOnStagePatient(onStagePatient)
} finally {
finishFlag.value = false
}
@@ -70,11 +70,11 @@
}
const getOnstagePatient = () => {
- const tempPatient : QueueVO | undefined = patientList.value.find(item => item.status === 30)
- if (undefined === tempPatient) {
+ const tempPatient : QueueVO | undefined | null = patientList.value.find(item => item.status === 30)
+ if (tempPatient == null) {
// setOnStagePatient(undefined)
- } else if (tempPatient.patId !== onStagePatient.value.patId) {
- onStagePatient.value = tempPatient
+ } else if (tempPatient.patId !== onStagePatient.patId) {
+ onStagePatient = tempPatient
setOnStagePatient(tempPatient)
}
}
@@ -152,8 +152,10 @@
})
const onEventDevReady = () => {
- //console.info("onDevRentPanelEvent...")
- onStagePatient.value.patId = ""
+ onStagePatient = {
+ bedNo: "", bookCheckType: 0, bookTimeslot: 0, expired: 0, id: 0, jumpFlag: 0, passed: 0,
+ patGender: 0, patId: "", patName: "", roomId: 0, roomName: "", seqNum: 0, status: 0
+ }
console.info("autoCall " + autoCall.value)
if (autoCall.value) {
@@ -169,7 +171,7 @@
/** 鎮ｈ�呭彉鏇存搷浣� */
const devReadyPanelRef = ref()
-const setOnStagePatient = (tempPatient: QueueVO | undefined) => {
+const setOnStagePatient = (tempPatient: QueueVO | undefined | null) => {
devReadyPanelRef.value.setPatient(tempPatient)
}
--
Gitblit v1.9.3