From 0674215b53ea136fe8726965199e0a25d3f201c3 Mon Sep 17 00:00:00 2001
From: Auora <14587305+auoraasd@user.noreply.gitee.com>
Date: Wed, 5 Nov 2025 14:09:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=A8=E8=AF=8A=E6=8C=82?=
 =?UTF-8?q?=E5=8F=B7=E5=92=8C=E8=B4=B9=E7=94=A8=E6=94=AF=E4=BB=98=E4=B8=8A?=
 =?UTF-8?q?=E7=9A=84=E8=B4=B9=E7=94=A8=E6=80=A7=E8=B4=A8=E4=B8=8D=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E5=B9=B6=E4=B8=94?=
 =?UTF-8?q?=E5=B0=86=E8=A7=A3=E5=86=B3=E6=97=A0=E6=B3=95=E6=94=B6=E8=B4=B9?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PaymentReconciliationController.java      |  8 ++---
 openhis-ui-vue3/index.html                    |  2 +-
 .../src/views/charge/cliniccharge/index.vue   |  4 +++
 .../components/chargeDialog.vue               | 31 ++++++++++++++++++-
 .../charge/outpatientregistration/index.vue   | 10 ++++--
 5 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentReconciliationController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentReconciliationController.java
index b97889d7..b77ea789 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentReconciliationController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentReconciliationController.java
@@ -172,13 +172,13 @@ public class PaymentReconciliationController {
     /**
      * 挂号收费（挂号收费先医保挂号，收费成功后再本系统挂号）
      *
-     * @param outpatientRegistrationAddParam 挂号信息
+     * @param outpatientRegistrationSettleParam 挂号信息
      * @return 操做结果
      */
     @PostMapping("/reg-pay")
-    public R<?> regPay(@Valid @RequestBody OutpatientRegistrationSettleParam outpatientRegistrationAddParam) {
-        R<?> result = paymentReconciliationService.regPay(outpatientRegistrationAddParam,
-                outpatientRegistrationAddParam.getChrgBchno(), outpatientRegistrationAddParam.getPaymentDetails());
+    public R<?> regPay(@Valid @RequestBody OutpatientRegistrationSettleParam outpatientRegistrationSettleParam) {
+        R<?> result = paymentReconciliationService.regPay(outpatientRegistrationSettleParam,
+                outpatientRegistrationSettleParam.getChrgBchno(), outpatientRegistrationSettleParam.getPaymentDetails());
         // 付款成功后，开具发票
         if (result.getCode() == 200) {
             PaymentReconciliation paymentRecon = null;
diff --git a/openhis-ui-vue3/index.html b/openhis-ui-vue3/index.html
index 02154634..4406ebfd 100644
--- a/openhis-ui-vue3/index.html
+++ b/openhis-ui-vue3/index.html
@@ -9,7 +9,7 @@
       content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
     />
     <!-- <link rel="icon" href="src/assets/images/ccu.png" /> -->
-    <link rel="stylesheet" type="text/css" media="print" href="/public/print-lock.css">
+    <link rel="stylesheet" type="text/css" media="print" href="/print-lock.css">
     <title>医院信息管理系统</title>
     <!--[if lt IE 11
       ]><script>
diff --git a/openhis-ui-vue3/src/views/charge/cliniccharge/index.vue b/openhis-ui-vue3/src/views/charge/cliniccharge/index.vue
index 5800b981..594b96b5 100644
--- a/openhis-ui-vue3/src/views/charge/cliniccharge/index.vue
+++ b/openhis-ui-vue3/src/views/charge/cliniccharge/index.vue
@@ -182,6 +182,8 @@
       :paymentId="paymentId"
       :details="details"
       :chargedItems="chargedItems"
+      :feeType="patientInfo.medfeePaymtdCode"
+      :medfee_paymtd_code="medfee_paymtd_code"
       @refresh="getPatientList"
     />
   </div>
@@ -203,11 +205,13 @@ import useUserStore from '@/store/modules/user';
 
 const { proxy } = getCurrentInstance();
 const userStore = useUserStore();
+const { medfee_paymtd_code } = proxy.useDict('medfee_paymtd_code');
 const queryParams = ref({
   pageNum: 1,
   pageSize: 50,
   statusEnum: 1,
 });
+
 const totalAmounts = ref(0);
 const selectedRows = ref([]);
 const patientList = ref([]);
diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/chargeDialog.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/chargeDialog.vue
index 2bb4b235..fb64ad54 100644
--- a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/chargeDialog.vue
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/chargeDialog.vue
@@ -4,7 +4,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">
@@ -97,6 +97,23 @@ import { computed, watch, reactive, ref, getCurrentInstance, nextTick } from 'vu
 import { Delete } from '@element-plus/icons-vue';
 import { debounce } from 'lodash-es';
 
+// 获取费用性质文本
+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,
@@ -130,6 +147,14 @@ const props = defineProps({
     type: Object,
     default: undefined,
   },
+  medfee_paymtd_code: {
+     type: Array,
+     default: () => [],
+   },
+  feeType: {
+    type: String,
+    default: '',
+  }
 });
 
 const { proxy } = getCurrentInstance();
@@ -271,6 +296,10 @@ function submit() {
     return;
   }
   dialogLoading.value = true;
+  // 确保设置默认合同编号，避免非医保结算时查询合同信息
+  if (props.transformedData && props.transformedData.accountFormData) {
+    props.transformedData.accountFormData.contractNo = '0000';
+  }
   savePayment({
     // paymentEnum: 0,
     // kindEnum: 1,
diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
index 4bdfac93..72dd63e7 100644
--- a/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
@@ -395,7 +395,7 @@
             />
             <el-table-column label="年龄" align="center" key="age" prop="age" width="120">
               <template #default="scope">
-                {{ scope.row.age ? `${scope.row.age}岁` : '-' }}
+                {{ scope.row.age ? `${scope.row.age}` : '-' }}
               </template>
             </el-table-column>
             <el-table-column
@@ -551,6 +551,8 @@
       :transformedData="transformedData"
       :chrgBchno="chrgBchno"
       :registerBusNo="registerBusNo"
+      :feeType="(patientInfo && patientInfo.medfeePaymtdCode) || (form && form.value && form.value.contractNo) || ''"
+      :medfee_paymtd_code="medfee_paymtd_code"
     />
     <RefundDialog
       :open="openRefundDialog"
@@ -1097,6 +1099,7 @@ function handleAdd() {
   console.log(transformedData, 'transformedData门诊挂号');
   chargeItemIdList.value = [];
   patientInfo.value.patientId = form.value.patientId;
+  patientInfo.value.medfeePaymtdCode = form.value.contractNo; // 设置费用性质
   proxy.$refs['outpatientRegistrationRef'].validate((valid) => {
     if (valid) {
       readCardLoading.value = true;
@@ -1107,7 +1110,10 @@ function handleAdd() {
       addOutpatientRegistration(transformedData.value)
         .then((res) => {
           if (res.code == 200) {
-            // proxy.$modal.msgSuccess('挂号成功');
+            console.log('挂号成功，返回数据:', res.data);
+            // 立即刷新列表，确保挂号信息显示在当日已挂号列表中
+            getList();
+            
             chrgBchno.value = res.data.chrgBchno;
             registerBusNo.value = res.data.busNo;
             totalAmount.value = res.data.psnCashPay;