From 5361749ff917fcfa3ed3088153c12ec20c76273c Mon Sep 17 00:00:00 2001
From: zhaoyun <zhaoyun@gentronhealth.com>
Date: Fri, 19 Jun 2026 02:10:45 +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/index.vue           | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/healthlink-his-ui/src/views/inpatientDoctor/home/components/diagnosis/index.vue b/healthlink-his-ui/src/views/inpatientDoctor/home/components/diagnosis/index.vue
index 7c49515b3..cdbc49966 100755
--- a/healthlink-his-ui/src/views/inpatientDoctor/home/components/diagnosis/index.vue
+++ b/healthlink-his-ui/src/views/inpatientDoctor/home/components/diagnosis/index.vue
@@ -10,6 +10,7 @@
         <el-space>
           <el-button
             type="primary"
+            :disabled="hasUnsavedDiagnosis"
             @click="addNewDiagnosis"
           >
             新增诊断
@@ -19,6 +20,7 @@
           </el-button>
           <el-button
             type="primary"
+            :disabled="hasUnsavedDiagnosis"
             @click="addNewChinese"
           >
             中医诊断
@@ -323,6 +325,11 @@ const diagnosisSearchkey = ref('')
 const syndromeSearchkey = ref('')
 const syndromeList = ref([])
 
+// Bug #783: 是否存在未保存的新诊断（无 conditionId 的即为未保存）
+const hasUnsavedDiagnosis = computed(() => {
+  return diagnoseData.value.some(item => !item.conditionId)
+})
+
 // 获取诊断类型字典（住院诊断类别）
 const { inpatient_diag_category } = proxy.useDict('inpatient_diag_category')
 
@@ -348,8 +355,8 @@ function getCurrentDate() {
 }
 
 function addNewDiagnosis() {
-  // Bug #783: 存在未保存的新诊断时，不允许继续新增
-  const hasUnsavedRow = diagnoseData.value.some(item => item.isNew && !item.conditionId)
+  // Bug #783: 存在未保存的诊断时，不允许继续新增
+  const hasUnsavedRow = diagnoseData.value.some(item => !item.conditionId)
   if (hasUnsavedRow) {
     ElMessage.warning('请先保存已新增的诊断，再添加新诊断')
     return
@@ -380,8 +387,8 @@ function addNewDiagnosis() {
 }
 
 function addNewChinese() {
-  // Bug #783: 存在未保存的新诊断时，不允许继续新增
-  const hasUnsavedRow = diagnoseData.value.some(item => item.isNew && !item.conditionId)
+  // Bug #783: 存在未保存的诊断时，不允许继续新增
+  const hasUnsavedRow = diagnoseData.value.some(item => !item.conditionId)
   if (hasUnsavedRow) {
     ElMessage.warning('请先保存已新增的诊断，再添加新诊断')
     return