From d7d76c922e9210be8dc18ee6d4f08a2ea2f92be6 Mon Sep 17 00:00:00 2001
From: wangjian963 <15215920+aprilry@user.noreply.gitee.com>
Date: Wed, 17 Jun 2026 15:18:48 +0800
Subject: [PATCH] =?UTF-8?q?712=20=E3=80=90=E6=94=B6=E8=B4=B9=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E7=AB=99-=E9=A2=84=E4=BA=A4=E9=87=91=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E3=80=91=E2=80=9C=E9=A2=84=E4=BA=A4=E9=87=91=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E2=80=9D=E9=A1=B5=E9=9D=A2=E7=BC=BA=E5=A4=B1=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E2=80=9C=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F=E2=80=9D?=
 =?UTF-8?q?=E5=88=97=E5=8F=8A=E6=82=A3=E8=80=85=E2=80=9C=E5=BA=8A=E5=8F=B7?=
 =?UTF-8?q?=E2=80=9D=E3=80=81=E2=80=9C=E8=B4=B9=E7=94=A8=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/AdvancePaymentInfoDto.java            |  5 ++
 .../AdvancePaymentManageAppMapper.xml         | 14 +++-
 .../charge/advanceDeposit/index.vue           | 68 +++++++++++--------
 3 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/AdvancePaymentInfoDto.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/AdvancePaymentInfoDto.java
index aca7511a4..88b57dab9 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/AdvancePaymentInfoDto.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/AdvancePaymentInfoDto.java
@@ -93,4 +93,9 @@ public class AdvancePaymentInfoDto {
      */
     private BigDecimal balanceAmount;
 
+    /**
+     * 费用类型（医保类型，如：职工医保）
+     */
+    private String feeType;
+
 }
diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/AdvancePaymentManageAppMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/AdvancePaymentManageAppMapper.xml
index 13eb8ba83..a84a977e9 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/AdvancePaymentManageAppMapper.xml
+++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalcharge/AdvancePaymentManageAppMapper.xml
@@ -18,7 +18,8 @@
         api.inHospital_org_name,
         api.account_id,
         api.total_amount,
-        api.balance_amount
+        api.balance_amount,
+        api.fee_type
         from (SELECT ae.tenant_id,
         ae.ID AS encounter_id,
         ae.bus_no AS bus_no,
@@ -34,7 +35,8 @@
         aa.id AS account_id,
         COALESCE(payment.total_amount, 0) AS total_amount,
         COALESCE(payment.total_amount, 0) - COALESCE(consumption.consumption_amount, 0) +
-        COALESCE(return_pay.return_amount, 0) AS balance_amount
+        COALESCE(return_pay.return_amount, 0) AS balance_amount,
+        fee_info.fee_type AS fee_type
         FROM adm_encounter AS ae
         LEFT JOIN adm_patient AS ap ON ap.ID = ae.patient_id
         AND ap.delete_flag = '0'
@@ -83,6 +85,14 @@
         AND aci.status_enum IN (#{status3})
         AND aci.encounter_id = ae.ID
         ) AS return_pay ON TRUE
+        LEFT JOIN LATERAL (
+            SELECT fc.contract_name AS fee_type
+            FROM adm_account AS aa2
+            LEFT JOIN fin_contract AS fc ON fc.bus_no = aa2.contract_no AND fc.delete_flag = '0'
+            WHERE aa2.encounter_id = ae.ID AND aa2.delete_flag = '0'
+              AND aa2.type_code != #{accountTypeCode}
+            LIMIT 1
+        ) AS fee_info ON TRUE
         WHERE ae.delete_flag = '0'
         AND ae.status_enum != #{registeredFlag}
         AND ae.class_enum = #{classEnum}
diff --git a/healthlink-his-ui/src/views/inHospitalManagement/charge/advanceDeposit/index.vue b/healthlink-his-ui/src/views/inHospitalManagement/charge/advanceDeposit/index.vue
index 7d5bbae2d..241b089d3 100755
--- a/healthlink-his-ui/src/views/inHospitalManagement/charge/advanceDeposit/index.vue
+++ b/healthlink-his-ui/src/views/inHospitalManagement/charge/advanceDeposit/index.vue
@@ -8,29 +8,28 @@
       <el-row
         :gutter="20"
         align="middle"
+        justify="space-between"
       >
-        <el-col :span="6">
-          <span class="descriptions-item-label">住院号：</span>
-          <el-input
-            v-model="queryParams.searchKey"
-            placeholder="请输入内容"
-            clearable
-            style="width: 300px"
-            @keyup.enter="getPatientInfo"
-          />
-          <el-button
-            type="primary"
-            style="margin-left: 10px"
-            @click="getPatientInfo"
-          >
-            查询
-          </el-button>
-        </el-col>
-        <el-col
-          :span="18"
-          style="text-align: right"
-        >
+        <el-col :span="16">
           <el-space>
+            <span class="descriptions-item-label">住院号：</span>
+            <el-input
+              v-model="queryParams.searchKey"
+              placeholder="请输入住院号"
+              clearable
+              style="width: 260px"
+              @keyup.enter="getPatientInfo"
+            />
+            <el-button
+              type="primary"
+              @click="getPatientInfo"
+            >
+              查询
+            </el-button>
+          </el-space>
+        </el-col>
+        <el-col :span="8">
+          <el-space style="float: right">
             <el-button
               type="primary"
               @click="confirmCharge()"
@@ -107,21 +106,32 @@
         :gutter="24"
         style="margin-top: 10px"
       >
-        <el-col :span="23">
+        <el-col :span="6">
           <span class="descriptions-item-label">在院科室/病区: </span>
           <span
             v-if="patientInfo.inHospitalOrgName"
             class="descriptions-item-value"
           >
             {{ patientInfo.inHospitalOrgName }} /
-            {{
-              patientInfo.wardName +
-                formatValue(patientInfo.houseName) +
-                formatValue(patientInfo.bedName)
-            }}
+            {{ patientInfo.wardName + formatValue(patientInfo.houseName) }}
           </span>
         </el-col>
-        <el-col :span="1">
+        <el-col :span="4">
+          <span class="descriptions-item-label">床号: </span>
+          <span class="descriptions-item-value">
+            {{ patientInfo.bedName || '--' }}
+          </span>
+        </el-col>
+        <el-col :span="4">
+          <span class="descriptions-item-label">费用类型: </span>
+          <span class="descriptions-item-value">
+            {{ patientInfo.feeType || '自费' }}
+          </span>
+        </el-col>
+        <el-col
+          :span="9"
+          style="text-align: right"
+        >
           <el-button
             type="primary"
             @click="refund()"
@@ -366,7 +376,7 @@ async function handlePrint(row) {
       // 科室信息
       inHospitalOrgName: patientInfo.value.inHospitalOrgName || "",
       bedName: patientInfo.value.bedName || "",
-      contractName: patientInfo.value.contractName || "自费",
+      contractName: patientInfo.value.feeType || patientInfo.value.contractName || "自费",
       // 费用信息
       chargeItem: "住院预缴款",
       paymentMethod: row.payWayEnum_enumText || row.paymentMethod || row.paymentEnum_enumText || "现金",