From 4e7c32e0ac0496b54582c6a84b30abc34ee03b1c Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期五, 30 十月 2026 16:41:18 +0800
Subject: [PATCH] 同步捐献器官费用表明细
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java | 8 ++++++++
ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml | 4 ++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/OrganfeeExportDto.java | 8 +++++++-
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java | 6 ++++++
4 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java
index b237339..496bd0f 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java
@@ -90,6 +90,14 @@
private String organname;
/**
+ * 浠樻鍣ㄥ畼鍚嶇О
+ */
+ @ApiModelProperty("浠樻鍣ㄥ畼鍚嶇О")
+ @Excel(name = "浠樻鍣ㄥ畼鍚嶇О")
+ @TableField("pay_organ_name")
+ private String payOrganName;
+
+ /**
* 鍣ㄥ畼搴旀敹璐圭敤
*/
@ApiModelProperty("鍣ㄥ畼搴旀敹璐圭敤")
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java
index 9ec773e..8c63955 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java
@@ -94,6 +94,12 @@
@Excel(name = "鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ")
private String organname;
+ /**
+ * 浠樻鍣ㄥ畼鍚嶇О
+ */
+ @ApiModelProperty("浠樻鍣ㄥ畼鍚嶇О")
+ @Excel(name = "浠樻鍣ㄥ畼鍚嶇О")
+ private String payOrganName;
/**
* 鍣ㄥ畼搴旀敹璐圭敤
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/OrganfeeExportDto.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/OrganfeeExportDto.java
index a80cd27..2c6b9d5 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/OrganfeeExportDto.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/OrganfeeExportDto.java
@@ -40,6 +40,12 @@
private String organname;
/**
+ * 浠樻鍣ㄥ畼鍚嶇О
+ */
+ @Excel(name = "浠樻鍣ㄥ畼鍚嶇О", width = 18)
+ private String payOrganName;
+
+ /**
* 鍣ㄥ畼鍒嗛厤缂栧彿
*/
@Excel(name = "鍣ㄥ畼鍒嗛厤缂栧彿", width = 25)
@@ -72,7 +78,7 @@
/**
* 搴旀敹閲戦-瀹炴敹閲戦
*/
- @Excel(name = "搴旀敹閲戦-瀹炴敹閲戦", width = 18, cellType = Excel.ColumnType.NUMERIC)
+ @Excel(name = "鏈粯閲戦", width = 18, cellType = Excel.ColumnType.NUMERIC)
private BigDecimal receivableBalance;
/**
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
index 9749fa1..7b169e7 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
@@ -15,6 +15,7 @@
<result property="hospitalno" column="HospitalNo"/>
<result property="organno" column="OrganNo"/>
<result property="organname" column="OrganName"/>
+ <result property="payOrganName" column="pay_organ_name"/>
<result property="organcharge" column="organcharge"/>
<result property="organtime" column="organtime"/>
<result property="chargeoperator" column="chargeoperator"/>
@@ -48,6 +49,7 @@
HospitalNo,
OrganNo,
OrganName,
+ pay_organ_name,
organcharge,
organtime,
chargeoperator,
@@ -109,6 +111,7 @@
o.HospitalNo,
o.OrganNo,
o.OrganName,
+ o.pay_organ_name,
o.organcharge,
o.organtime,
o.chargeoperator,
@@ -173,6 +176,7 @@
<if test="hospitalno != null and hospitalno != ''">HospitalNo = #{hospitalno},</if>
<if test="organno != null and organno != ''">OrganNo = #{organno},</if>
<if test="organname != null and organname != ''">OrganName = #{organname},</if>
+ <if test="payOrganName != null and payOrganName != ''">pay_organ_name = #{payOrganName},</if>
<if test="organcharge != null ">organcharge = #{organcharge},</if>
<if test="organtime != null ">organtime = #{organtime},</if>
<if test="chargeoperator != null and chargeoperator != ''">chargeoperator = #{chargeoperator},</if>
--
Gitblit v1.9.3