From 549e0a0cda7fdaafc3d2e456b61187b7eed2c131 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 25 十一月 2024 20:14:34 +0800
Subject: [PATCH] Fix bug, 当天多个预约 打印小票检查项目不对

---
 src/api/ecg/appointment/index.ts                  |    4 ++--
 src/views/ecg/appointment/AppointmentForm.vue     |    4 ++--
 src/views/ecg/queue/index.vue                     |    6 +++---
 src/views/ecg/doctor/components/DevReadyPanel.vue |   10 +++++-----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/api/ecg/appointment/index.ts b/src/api/ecg/appointment/index.ts
index af3fe39..d2338b0 100644
--- a/src/api/ecg/appointment/index.ts
+++ b/src/api/ecg/appointment/index.ts
@@ -40,8 +40,8 @@
   },
 
   //
-  getCurAppointmentByPatId: async (patId: string) => {
-    return await request.get({ url: `/ecg/appointment/get-current-by-patient?patId=` + patId })
+  getCurAppointmentByPatIdAndCheckType: async (patId: string, checkType: number) => {
+    return await request.get({ url: `/ecg/appointment/get-current-by-patient?patId=` + patId + '&checkType=' + checkType })
   },
 
   // 浠嶩IS鎴栬�匘B鏌ヨ棰勭害璇︽儏
diff --git a/src/views/ecg/appointment/AppointmentForm.vue b/src/views/ecg/appointment/AppointmentForm.vue
index 432e460..864f5a3 100644
--- a/src/views/ecg/appointment/AppointmentForm.vue
+++ b/src/views/ecg/appointment/AppointmentForm.vue
@@ -219,7 +219,7 @@
     }
   }
 }
-const openByQueue = async (type: string, patId: string) => {
+const openByQueue = async (type: string, patId: string, checkType: number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
@@ -228,7 +228,7 @@
   if (patId) {
     formLoading.value = true
     try {
-      formData.value = await AppointmentApi.getCurAppointmentByPatId( patId )
+      formData.value = await AppointmentApi.getCurAppointmentByPatIdAndCheckType( patId, checkType )
     } finally {
       formLoading.value = false
     }
diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index c977620..7dca91c 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -49,8 +49,8 @@
     </el-form>
     <el-button @click="submitForm" type="primary" :disabled="formLoading">棰嗙敤瀹屾垚</el-button>
     <el-checkbox style="margin-left:10px" label="鑷姩&nbsp;" v-model="autoPrint" />
-    <el-button @click="printBill(formData.patId)">鎵撳嵃灏忕エ</el-button>
-    <el-button @click="printBill(formData.patId, 8)">鎵撳嵃灏忕エ2</el-button>
+    <el-button @click="printBill(formData.patId, formData.checkType)">鎵撳嵃灏忕エ</el-button>
+    <el-button @click="printBill(formData.patId, formData.checkType, 8)">鎵撳嵃灏忕エ2</el-button>
     <el-button @click="cancelReady"  :disabled="formLoading">鏀惧純棰嗙敤</el-button>
     <el-button @click="resetForm()">閲� 缃�</el-button>
     <el-button @click="feeConfirm"  :disabled="formLoading">纭垂</el-button>
@@ -240,7 +240,7 @@
     await DevRentApi.devReady(data)
 
     if (autoPrint.value)
-      printBill( data.patId)
+      printBill( data.patId, data.checkType)
 
     dialogVisible.value = false
     // 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
@@ -355,9 +355,9 @@
   formData.value = await DevRentApi.getDevRent(rentId)
 }
 
-const printBill = async (patId: string, printMode?: number) => {
+const printBill = async (patId: string, checkType: number, printMode?: number) => {
 
-  const curAppointment: AppointmentVO = await AppointmentApi.getCurAppointmentByPatId( patId )
+  const curAppointment: AppointmentVO = await AppointmentApi.getCurAppointmentByPatIdAndCheckType( patId, checkType )
   console.info( curAppointment )
 
 // 寮曞叆鍚庝娇鐢ㄧず渚�
diff --git a/src/views/ecg/queue/index.vue b/src/views/ecg/queue/index.vue
index 84e4000..5fcf837 100644
--- a/src/views/ecg/queue/index.vue
+++ b/src/views/ecg/queue/index.vue
@@ -176,7 +176,7 @@
           <el-button
             link
             type="primary"
-            @click="openAppointmentForm('preview', scope.row.patId)"
+            @click="openAppointmentForm('preview', scope.row.patId, scope.row.bookCheckType)"
             v-hasPermi="['ecg:appointment:preview']"
           >
             鏌ョ湅
@@ -297,8 +297,8 @@
 const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id)
 }
-const openAppointmentForm = (type: string, patId: string, status: number) => {
-  formRef.value.openByQueue(type, patId, status)
+const openAppointmentForm = (type: string, patId: string, checkType: number) => {
+  formRef.value.openByQueue(type, patId, checkType)
 }
 
 /** 鍒犻櫎鎸夐挳鎿嶄綔 */

--
Gitblit v1.9.3