From 9db73db03140c8b5b9485317dbe98e4a1954abe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=BA=91?= <赵云@gentronhealth.com>
Date: Mon, 11 May 2026 12:06:35 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#508:=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=E7=82=B9=E5=87=BB"=E5=88=92?=
=?UTF-8?q?=E4=BB=B7=E7=BB=84=E5=A5=97"=E6=8C=89=E9=92=AE=E6=97=A0?=
=?UTF-8?q?=E4=BB=BB=E4=BD=95=E5=93=8D=E5=BA=94=EF=BC=8C=E6=97=A0=E6=B3=95?=
=?UTF-8?q?=E9=80=89=E6=8B=A9=E7=BB=84=E5=A5=97=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
修复三个问题：
1. 后端DTO字段名为Name(大写)而前端模板引用name(小写)，导致组套名称显示为空，使用name || Name兼容
2. 后端未返回rangeCode_dictText字段，新增getRangeText()函数根据当前选中范围标签动态显示
3. 前端向/group-package-for-order接口发送searchKey参数但后端不支持，移除该多余参数
---
.../InpatientBilling/components/FeeDialog.vue | 21 ++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
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 5a9e6687..ba654b9c 100755
--- a/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/FeeDialog.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/FeeDialog.vue
@@ -280,8 +280,16 @@
style="width: 100%"
>
-
-
+
+
+ {{ scope.row.name || scope.row.Name || '' }}
+
+
+
+
+ {{ getRangeText(scope.row) }}
+
+
{{ scope.row.detailList?.length || 0 }} 项
@@ -763,7 +771,7 @@ function openGroupSetDialog() {
function loadGroupSets() {
groupSetLoading.value = true;
- getOrderGroup({ organizationId: orgId.value, searchKey: groupSetSearchText.value })
+ getOrderGroup({ organizationId: orgId.value })
.then((res) => {
const data = res?.data || {};
if (groupSetRange.value === 1) {
@@ -783,6 +791,13 @@ function loadGroupSets() {
});
}
+function getRangeText(row) {
+ // 后端未返回rangeCode，根据当前选中的范围标签显示
+ const rangeMap = { 1: '个人', 2: '科室', 3: '全院' };
+ if (row.rangeCode_dictText) return row.rangeCode_dictText;
+ return rangeMap[groupSetRange.value] || '';
+}
+
function handleGroupSetSelect(row) {
selectedGroupSet.value = row;
}