From 075a4553cbc51b9436c2de157d8fa70914359c83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=8E=E4=BD=97?= <huatuo@gentronhealth.com>
Date: Fri, 19 Jun 2026 02:08:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(#783):=20=E8=AF=B7=E4=BF=AE=E5=A4=8D=20Bug?=
 =?UTF-8?q?=20#783=EF=BC=88=E8=AF=B8=E8=91=9B=E4=BA=AE=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=8C=E5=88=86=E9=85=8D=E7=BB=99=E4=BD=A0?=
 =?UTF-8?q?=EF=BC=89?=
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