From 24bc049fa083816bd6f8f08fa81b3c4652915e24 Mon Sep 17 00:00:00 2001
From: chenqi <chen.qi@jin-group.cn>
Date: Wed, 25 Mar 2026 19:17:05 +0800
Subject: [PATCH] =?UTF-8?q?feat(surgicalschedule):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=B4=B9=E7=94=A8=E7=B1=BB=E5=88=AB=E5=AD=97=E6=AE=B5=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在手术安排界面中添加费用类别字段映射
- 在申请单页面DTO中新增费用类别属性
- 在数据映射文件中添加费用类别结果映射
- 通过关联账户和合同表查询费用类别信息
- 实现手术安排中费用类别的完整数据流处理
---
 .../web/regdoctorstation/dto/RequestFormPageDto.java        | 4 ++++
 .../mapper/regdoctorstation/RequestFormManageAppMapper.xml  | 6 +++++-
 openhis-ui-vue3/src/views/surgicalschedule/index.vue        | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormPageDto.java
index 9f3a295e..60f10663 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormPageDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormPageDto.java
@@ -77,4 +77,8 @@ public class RequestFormPageDto {
      * 申请时间
      */
     private String applyTime;
+    /**
+     * 费用类别
+     */
+    private String feeType;
 }
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
index 1e981ba2..411ccf22 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
@@ -63,6 +63,7 @@
         <result column="apply_dept_name" property="applyDeptName"/>
         <result column="encounter_id" property="encounterId"/>
         <result column="surgery_type_enum" property="surgeryTypeEnum"/>
+        <result column="fee_type" property="feeType"/>
     </resultMap>
 
     <!-- 分页查询申请单 -->
@@ -83,11 +84,14 @@
                 cs.main_surgeon_name,
                 cs.apply_dept_id,
                 cs.apply_dept_name,
-                cs.surgery_type_enum
+                cs.surgery_type_enum,
+                fc.contract_name AS fee_type
             FROM doc_request_form drf
             LEFT JOIN cli_surgery cs ON cs.surgery_no = drf.prescription_no
             LEFT JOIN adm_patient ap ON ap.id = cs.patient_id
             LEFT JOIN adm_encounter ae ON ae.id = cs.encounter_id
+            LEFT JOIN adm_account aa ON aa.encounter_id = ae.id AND aa.delete_flag = '0'
+            LEFT JOIN fin_contract fc ON fc.bus_no = aa.contract_no AND fc.delete_flag = '0'
             <where>
                 <if test="requestFormDto.applyTimeStart != null">
                     AND drf.create_time >= #{requestFormDto.applyTimeStart}
diff --git a/openhis-ui-vue3/src/views/surgicalschedule/index.vue b/openhis-ui-vue3/src/views/surgicalschedule/index.vue
index bcaaeefc..3579fe8c 100644
--- a/openhis-ui-vue3/src/views/surgicalschedule/index.vue
+++ b/openhis-ui-vue3/src/views/surgicalschedule/index.vue
@@ -1751,6 +1751,7 @@ function confirmApply() {
   form.surgeryNature = selectedRow.surgeryTypeEnum//手术性质
   form.surgeonCode = selectedRow.mainSurgeonId//主刀医生id
   form.surgeonName = selectedRow.mainSurgeonName//主刀医生姓名
+  form.feeType = selectedRow.feeType//费用类别
   showApplyDialog.value = false
 }