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 }, }); } /**