From d21a2f49c17fcb4d311cb6a92e98163a9d120569 Mon Sep 17 00:00:00 2001 From: zhaoyun Date: Wed, 17 Jun 2026 23:35:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix(#786):=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 --- .../inpatientNurse/medicineReturn/index.vue | 31 +++---------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/healthlink-his-ui/src/views/inpatientNurse/medicineReturn/index.vue b/healthlink-his-ui/src/views/inpatientNurse/medicineReturn/index.vue index c2b80f9a0..edddd291d 100755 --- a/healthlink-his-ui/src/views/inpatientNurse/medicineReturn/index.vue +++ b/healthlink-his-ui/src/views/inpatientNurse/medicineReturn/index.vue @@ -1,31 +1,10 @@ - - \ No newline at end of file + From fe2a60f379ae8d5129f6fcdc0e84d60b29be44ce Mon Sep 17 00:00:00 2001 From: zhaoyun Date: Wed, 17 Jun 2026 23:49:11 +0800 Subject: [PATCH 2/4] =?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; } - - - - :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 + \ No newline at end of file From 3f164d45855a440d718d5d8feea223e3ddad71bf Mon Sep 17 00:00:00 2001 From: zhaoyun Date: Wed, 17 Jun 2026 23:53:27 +0800 Subject: [PATCH 3/4] =?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 } From 7c375f5af8b863e8f67a58aab6d865a0a71fe1db Mon Sep 17 00:00:00 2001 From: zhaoyun Date: Thu, 18 Jun 2026 01:05:57 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix(#723):=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 --- .../V66__bug723_fix_duplicate_menu_doctor_enhanced.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V66__bug723_fix_duplicate_menu_doctor_enhanced.sql diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V66__bug723_fix_duplicate_menu_doctor_enhanced.sql b/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V66__bug723_fix_duplicate_menu_doctor_enhanced.sql new file mode 100644 index 000000000..e5e190a16 --- /dev/null +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V66__bug723_fix_duplicate_menu_doctor_enhanced.sql @@ -0,0 +1,10 @@ +-- V66: 修复 Bug#723 — 删除 sys_menu 中重复的"住院医生增强"菜单条目 +-- 根因：sys_menu 表中存在两条 menu_name = '住院医生增强' 且 parent_id 相同的记录 +-- 修复：保留 menu_id 最小的一条（20171），删除其余重复记录 +DELETE FROM sys_menu +WHERE menu_name = '住院医生增强' + AND menu_id NOT IN ( + SELECT MIN(menu_id) + FROM sys_menu + WHERE menu_name = '住院医生增强' + );