解决当日已挂号页面费用性质不一致问题

openhis-ui-vue3/src/views/charge/outpatientregistration/components/chargeDialog.vue

@@ -296,23 +296,17 @@ function submit() {
     return;
   }
   dialogLoading.value = true;
-  // 确保设置默认合同编号，避免非医保结算时查询合同信息
+  // 根据费用性质动态设置合同编号
   if (props.transformedData && props.transformedData.accountFormData) {
-    props.transformedData.accountFormData.contractNo = '0000';
+    // 直接使用传入的feeType作为contractNo
+    // 如果feeType存在就使用，否则使用patientInfo中的medfeePaymtdCode，最后默认使用'0000'
+    props.transformedData.accountFormData.contractNo = props.feeType || props.patientInfo?.medfeePaymtdCode || '0000';
   }
   savePayment({
-    // paymentEnum: 0,
-    // kindEnum: 1,
-    // patientId: props.patientInfo.patientId,
-    // encounterId: props.patientInfo.encounterId,
-    // chargeItemIds: props.chargeItemIds,
     outpatientRegistrationAddParam: props.transformedData,
     chrgBchno: props.chrgBchno,
     busNo: props.registerBusNo,
     paymentDetails: formData.selfPay,
-    // ybFlag: '0',
-    // eleFlag: '0',
-    // returnedAmount: parseFloat(returnedAmount.value),
   })
     .then((res) => {
       if (res.code == 200) {

openhis-ui-vue3/src/views/charge/outpatientregistration/components/refundDialog.vue

@@ -11,7 +11,7 @@
       <el-text size="large" style="display: block; margin-bottom: 15px">
         退费日期：{{ currentDate }}
       </el-text>
-      <el-text size="large">费用性质：{{ '自费' }}</el-text>
+      <el-text size="large">费用性质：{{ getFeeTypeText }}</el-text>
       <div class="amount-row">
         <el-text size="large">应退金额：</el-text>
         <el-text size="large" type="primary" class="amount">
@@ -112,6 +112,23 @@ import { cancelRegister } from './outpatientregistration';
 import { computed, watch, reactive, ref, getCurrentInstance } from 'vue';
 import { Delete } from '@element-plus/icons-vue';
 
+// 获取费用性质文本
+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 '自费';
+});
+
 const props = defineProps({
   open: {
     type: Boolean,
@@ -135,6 +152,14 @@ const props = defineProps({
     type: [],
     default: [],
   },
+  medfee_paymtd_code: {
+     type: Array,
+     default: () => [],
+   },
+  feeType: {
+    type: String,
+    default: '',
+  }
 });
 
 const { proxy } = getCurrentInstance();

openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue

@@ -438,7 +438,8 @@
               align="center"
               key="contractName"
               prop="contractName"
-            />
+            >
+            </el-table-column>
             <el-table-column label="挂号金额" align="center" key="totalPrice" prop="totalPrice">
               <template #default="scope">
                 <span>
@@ -571,6 +572,8 @@
       :patientInfo="patientInfo"
       :paymentId="paymentId"
       :chargeItemIds="chargeItemIdList"
+      :feeType="(patientInfo && patientInfo.medfeePaymtdCode) || (form && form.value && form.value.contractNo) || ''"
+      :medfee_paymtd_code="medfee_paymtd_code"
     />
     <ReprintDialog
       :open="openReprintDialog"
@@ -606,7 +609,7 @@ import { invokeYbPlugin } from '@/api/public';
 import patientInfoDialog from './components/patientInfoDialog';
 import PatientAddDialog from './components/patientAddDialog';
 import patientList from './components/patientList';
-import { nextTick, ref } from 'vue';
+import { nextTick, ref, onMounted, onUnmounted } from 'vue';
 import ChargeDialog from './components/chargeDialog.vue';
 import RefundDialog from './components/refundDialog.vue';
 import ReprintDialog from './components/reprintDialog.vue';
@@ -771,6 +774,15 @@ onUnmounted(() => {
 
 const { queryParams, form, rules } = toRefs(data);
 
+/** 根据contractNo获取费用性质名称 */
+function getFeeTypeName(contractNo) {
+  if (!contractNo || !medfee_paymtd_code || !Array.isArray(medfee_paymtd_code)) {
+    return '';
+  }
+  const dictItem = medfee_paymtd_code.find(item => item.value === contractNo);
+  return dictItem ? dictItem.label : '';
+}
+
 /** 初期所用数据查询 */
 function getInitData() {
   getInit().then((response) => {