diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemDto.java index 158f1859..ade0312b 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/RefundItemDto.java @@ -81,5 +81,11 @@ public class RefundItemDto { /** 项目名 */ private String itemName; + + /** 费用支付方式编码 */ + private String medfeePaymtdCode; + + /** 费用类型 */ + private String feeType; } diff --git a/openhis-ui-vue3/src/views/charge/clinicrefund/components/refundDialog.vue b/openhis-ui-vue3/src/views/charge/clinicrefund/components/refundDialog.vue index 1501814f..99df6c5a 100644 --- a/openhis-ui-vue3/src/views/charge/clinicrefund/components/refundDialog.vue +++ b/openhis-ui-vue3/src/views/charge/clinicrefund/components/refundDialog.vue @@ -11,7 +11,7 @@ 退费日期:{{ currentDate }} - 费用性质:{{ '自费' }} + 费用性质:{{ getFeeTypeText }}
应退金额: @@ -160,6 +160,14 @@ const props = defineProps({ type: Object, default: undefined, }, + medfee_paymtd_code: { + type: Array, + default: () => [], + }, + feeType: { + type: String, + default: '', + }, }); const { proxy } = getCurrentInstance(); @@ -324,6 +332,23 @@ const returnedAmount = computed(() => { function close() { emit('close'); } + +// 获取费用性质文本 +const getFeeTypeText = computed(() => { + if (!props.medfee_paymtd_code || !Array.isArray(props.medfee_paymtd_code)) { + return '自费'; + } + // 如果有feeType,根据feeType查找对应的文本 + if (props.feeType) { + const dict = props.medfee_paymtd_code.find(item => item.value === props.feeType); + return dict ? dict.label : '自费'; + } + // 如果只有一个选项,直接返回第一个选项的文本 + if (props.medfee_paymtd_code.length === 1) { + return props.medfee_paymtd_code[0].label || '自费'; + } + return '自费'; +});