更新

admin/src/views/tcm/diagnosis/index_h5.vue

@@ -946,8 +946,28 @@ const appointmentRowClass = (row: any) => {
     }
 }
 
-const isAppointmentActiveForVideo = (row: any) =>
-    row.has_appointment && Number(row.appointment_status) === 1
+/**
+ * 同一诊单可能同时有已完成的旧挂号和已预约的新挂号，二维码应使用明细里的有效预约。
+ */
+const activeAppointment = (row: any) =>
+    appointmentRows(row).find((apt: any) => Number(apt?.status) === 1) ?? null
+
+const activeAppointmentRow = (row: any) => {
+    const apt = activeAppointment(row)
+    if (!apt) return null
+
+    return {
+        ...row,
+        has_appointment: 1,
+        appointment_id: apt.id,
+        appointment_status: apt.status,
+        appointment_doctor_id: apt.doctor_id,
+        appointment_doctor_name: apt.doctor_name,
+        appointment_time_text: apt.time_text
+    }
+}
+
+const isAppointmentActiveForVideo = (row: any) => !!activeAppointment(row)
 
 const canCancelAppointmentRow = (row: any) => {
     const s = Number(row.appointment_status)
@@ -1241,13 +1261,14 @@ const qrcodeAppointmentTimeText = computed(() => {
     return p.appointment_time_text || '—'
 })
 
-const handleVideoQRCode = async (row: any) => {
-    if (!isAppointmentActiveForVideo(row)) {
-        feedback.msgWarning('仅「已预约」状态可生成视频二维码'); return
-    }
-    if (!row.patient_id) { feedback.msgWarning('患者信息不完整'); return }
-    lastQRCodeType.value = 'video'
-    currentQRCodePatient.value = row
+const handleVideoQRCode = async (row: any) => {
+    const qrcodeRow = activeAppointmentRow(row)
+    if (!qrcodeRow) {
+        feedback.msgWarning('仅「已预约」状态可生成视频二维码'); return
+    }
+    if (!qrcodeRow.patient_id) { feedback.msgWarning('患者信息不完整'); return }
+    lastQRCodeType.value = 'video'
+    currentQRCodePatient.value = qrcodeRow
     qrcodeDialogVisible.value = true
     qrcodeLoading.value = true
     qrcodeUrl.value = ''
@@ -1258,11 +1279,11 @@ const handleVideoQRCode = async (row: any) => {
             feedback.msgError('小程序未配置')
             qrcodeDialogVisible.value = false
             return
-        }
-        const result = await generateMiniProgramQrcode({
-            doctor_id: row.appointment_doctor_id,
-            diagnosis_id: row.appointment_doctor_id,
-            patient_id: row.patient_id,
+        }
+        const result = await generateMiniProgramQrcode({
+            doctor_id: qrcodeRow.appointment_doctor_id,
+            diagnosis_id: qrcodeRow.appointment_doctor_id,
+            patient_id: qrcodeRow.patient_id,
             share_user_id: userStore.userInfo?.id || '',
             mini_program_path: 'pages/login/login'
         })
@@ -1275,13 +1296,14 @@ const handleVideoQRCode = async (row: any) => {
     }
 }
 
-const handleMiniProgramQRCode = async (row: any) => {
-    if (!isAppointmentActiveForVideo(row)) {
-        feedback.msgWarning('仅「已预约」状态可使用诊单二维码'); return
-    }
-    if (!row.patient_id) { feedback.msgWarning('患者信息不完整'); return }
-    lastQRCodeType.value = 'confirm'
-    currentQRCodePatient.value = row
+const handleMiniProgramQRCode = async (row: any) => {
+    const qrcodeRow = activeAppointmentRow(row)
+    if (!qrcodeRow) {
+        feedback.msgWarning('仅「已预约」状态可使用诊单二维码'); return
+    }
+    if (!qrcodeRow.patient_id) { feedback.msgWarning('患者信息不完整'); return }
+    lastQRCodeType.value = 'confirm'
+    currentQRCodePatient.value = qrcodeRow
     qrcodeDialogVisible.value = true
     qrcodeLoading.value = true
     qrcodeUrl.value = ''
@@ -1292,11 +1314,11 @@ const handleMiniProgramQRCode = async (row: any) => {
             feedback.msgError('小程序未配置')
             qrcodeDialogVisible.value = false
             return
-        }
-        const result = await generateMiniProgramQrcode({
-            diagnosis_id: row.id,
-            doctor_id: row.appointment_doctor_id,
-            patient_id: row.patient_id,
+        }
+        const result = await generateMiniProgramQrcode({
+            diagnosis_id: qrcodeRow.id,
+            doctor_id: qrcodeRow.appointment_doctor_id,
+            patient_id: qrcodeRow.patient_id,
             share_user_id: userStore.userInfo?.id || ''
         })
         if (result?.qrcode_url) qrcodeUrl.value = result.qrcode_url