From aa2d6665f95a0701b61272fd8065663070565034 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 15 四月 2025 12:31:05 +0800
Subject: [PATCH] bug fix:  pat_id  dev_id 都为空时 不应该取患者列表

---
 src/views/ecg/doctor/components/DevReadyPanel.vue |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index f846a23..3d52e4c 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,
@@ -217,6 +215,9 @@
 
 // 鏍规嵁鎮h�呮垨璁惧, 鑾峰彇 Free鐨勭璧�
 const getFreeRentInfo = async (devRentVO) => {
+  if ((devRentVO.devId == null || devRentVO.devId === '') && (devRentVO.patId == null || devRentVO.patId === '') )
+    return
+
   const data = await DevRentApi.getFreeRent(devRentVO)
   if (null === data)
     return
@@ -248,12 +249,11 @@
       feeConfirm()
     }
 
-    dialogVisible.value = false
-    // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
-    emit('event_dev_ready')
     resetForm()
     getList()
 
+    // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
+    emit('event_dev_ready')
     message.success(t('鎿嶄綔瀹屾垚'))
   } finally {
     formLoading.value = false
@@ -305,7 +305,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 +360,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({

--
Gitblit v1.9.3