From fe2a60f379ae8d5129f6fcdc0e84d60b29be44ce Mon Sep 17 00:00:00 2001
From: zhaoyun <zhaoyun@gentronhealth.com>
Date: Wed, 17 Jun 2026 23:49:11 +0800
Subject: [PATCH 1/2] =?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   | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

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 00bea6e24..cd8c78174 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
@@ -1160,13 +1160,20 @@ function handleNodeClick(data) {
   form.value.diagnosisList.push({
     ybNo: data.ybNo,
     name: data.name,
+    showPopover: false,
+    diagnosisSystem: '西医',
+    tcmSyndromeCode: '',
+    tcmSyndromeName: '',
+    syndromeDefinitionId: '',
+    syndromeGroupNo: '',
     verificationStatusEnum: 4,
     medTypeCode: undefined,
     diagSrtNo: form.value.diagnosisList.length + 1,
     definitionId: data.definitionId,
+    iptDiseTypeCode: 2,
+    diagnosisDesc: '',
     diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
     diagnosisTime: new Date().toLocaleString('zh-CN'),
-    // 添加 patientId
     patientId: props.patientInfo.patientId
   });
   if (form.value.diagnosisList.length == 1) {
@@ -1202,12 +1209,4 @@ defineExpose({ getList, getDetail, handleSaveDiagnosis });
   align-items: center;
   gap: 4px;
 }
-</style>
-
-
-            :disabled="hasUnsavedDiagnosis || isAdding"
-const isAdding = ref(false);
-  if (isAdding.value) return;
-  isAdding.value = true;
-      isAdding.value = false;
-    isAdding.value = false;
\ No newline at end of file
+</style>
\ No newline at end of file

From 3f164d45855a440d718d5d8feea223e3ddad71bf Mon Sep 17 00:00:00 2001
From: zhaoyun <zhaoyun@gentronhealth.com>
Date: Wed, 17 Jun 2026 23:53:27 +0800
Subject: [PATCH 2/2] =?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              | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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 903a20605..7c49515b3 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
@@ -348,6 +348,12 @@ function getCurrentDate() {
 }
 
 function addNewDiagnosis() {
+  // Bug #783: 存在未保存的新诊断时，不允许继续新增
+  const hasUnsavedRow = diagnoseData.value.some(item => item.isNew && !item.conditionId)
+  if (hasUnsavedRow) {
+    ElMessage.warning('请先保存已新增的诊断，再添加新诊断')
+    return
+  }
   const maxSortNo = diagnoseData.value.length > 0
     ? Math.max(...diagnoseData.value.map(item => item.sortNo || 0))
     : 0
@@ -374,6 +380,12 @@ function addNewDiagnosis() {
 }
 
 function addNewChinese() {
+  // Bug #783: 存在未保存的新诊断时，不允许继续新增
+  const hasUnsavedRow = diagnoseData.value.some(item => item.isNew && !item.conditionId)
+  if (hasUnsavedRow) {
+    ElMessage.warning('请先保存已新增的诊断，再添加新诊断')
+    return
+  }
   chineseMedicineDialogVisible.value = true
 }