From 49889e914093d96017d6f6a67d710dd5ce851e1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=B3=E7=BE=BD?= <关羽@gentronhealth.com> Date: Thu, 14 May 2026 06:13:26 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#507:=20[=E4=BD=8F=E9=99=A2?= =?UTF-8?q?=E6=8A=A4=E5=A3=AB=E7=AB=99-=E4=BD=8F=E9=99=A2=E8=AE=B0?= =?UTF-8?q?=E8=B4=A6-=E8=A1=A5=E8=B4=B9]=20=E9=A1=B9=E7=9B=AE=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E6=9C=AA=E8=8E=B7=E5=8F=96=E3=80=81=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E7=A7=91=E5=AE=A4=E6=98=BE=E7=A4=BA=E5=86=85=E7=A0=81=E4=B8=94?= =?UTF-8?q?=E7=BC=BA=E4=B9=8F=E9=BB=98=E8=AE=A4/=E6=A8=A1=E7=B3=8A?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 后端SQL修复: DoctorStationAdviceAppMapper.xml 中诊疗项 min_unit_code 硬编码为空字符串, 改为使用 permitted_unit_code,使前端单位下拉框有可用选项 前端修复: 1. api.js getOrgList 添加 pageSize:100 参数,确保获取足够科室数据 2. FeeDialog.vue loadDepartmentOptions 增加回退逻辑:当树形结构无children时使用扁平records Co-Authored-By: Claude Opus 4.7 --- .../mapper/doctorstation/DoctorStationAdviceAppMapper.xml | 2 +- .../InpatientBilling/components/FeeDialog.vue | 6 +++++- .../views/inpatientNurse/InpatientBilling/components/api.js | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml index 75df58148..6090fd4b6 100755 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml @@ -239,7 +239,7 @@ NULL AS activity_type_dictText, -- 前端"包装单位"列：显示使用单位（permitted_unit_code） T1.permitted_unit_code AS unit_code, - '' AS min_unit_code, + T1.permitted_unit_code AS min_unit_code, '' AS volume, '' AS method_code, '' AS rate_code, diff --git a/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/FeeDialog.vue b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/FeeDialog.vue index 615bb5698..e1632b25e 100755 --- a/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/FeeDialog.vue +++ b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/FeeDialog.vue @@ -524,7 +524,11 @@ function loadDepartmentOptions() { getOrgList() .then((res) => { if (res.data && res.data.records && res.data.records.length > 0) { - departmentOptions.value = res.data.records[0].children || []; + const firstRecord = res.data.records[0]; + // 优先使用 children（树形结构），回退到 records 本身（扁平结构） + departmentOptions.value = (firstRecord.children && firstRecord.children.length > 0) + ? firstRecord.children + : res.data.records; } }) .catch(() => { diff --git a/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/api.js b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/api.js index 36afccc22..bcfde13ef 100755 --- a/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/api.js +++ b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/api.js @@ -28,6 +28,7 @@ export function getOrgList() { return request({ url: '/base-data-manage/organization/organization', method: 'get', + params: { pageSize: 100, pageNum: 1 }, }); } /**