From 19112785701ba341946c5f347865223815e2c2ff Mon Sep 17 00:00:00 2001
From: zhaoyun <zhaoyun@gentronhealth.com>
Date: Wed, 17 Jun 2026 22:33:57 +0800
Subject: [PATCH] =?UTF-8?q?fix(#783):=20zhaoyun=20(=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=90=88=E5=85=A5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home/components/diagnosis/diagnosis.vue            | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/healthlink-his-ui/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue b/healthlink-his-ui/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue
index 0223451b0..6d72c6bef 100755
--- a/healthlink-his-ui/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue
+++ b/healthlink-his-ui/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue
@@ -767,6 +767,16 @@ function handleAddDiagnosis() {
 
   proxy.$refs.formRef.validate((valid, fields) => {
     console.log('表单验证结果:', valid, '错误字段:', fields);
+    // 再次检查是否有未保存的诊断（防止 validate 异步回调的竞态条件）
+    const hasUnsavedNow = (form.value.diagnosisList || []).some(
+      (item) => !item.conditionId && !item.encounterDiagnosisId
+    );
+    if (!valid || hasUnsavedNow) {
+      if (hasUnsavedNow) {
+        proxy.$modal.msgWarning('请保存当前诊断');
+      }
+      return;
+    }
     addDiagnosisItem();
   });
 }