From ee089a8ac4a9d99ef0a0491bbf1d80a2d4fbc393 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 10 十一月 2026 09:15:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeorganMapper.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeorganMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeorganMapper.java
index 2e86ef9..a665122 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeorganMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeorganMapper.java
@@ -5,6 +5,7 @@
 import com.ruoyi.project.domain.ServiceDonorchargeorgan;
 import com.ruoyi.project.domain.SpStatBonus;
 import com.ruoyi.project.domain.SpStatChange;
+import com.ruoyi.project.domain.SpStatChangeDetail;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -30,7 +31,14 @@
 
     public Boolean updateDonorchargeorgan(ServiceDonorchargeorgan serviceDonorchargeorgan);
 
+    /**
+     * 閫昏緫鍒犻櫎锛氫笉闄愬畾 del_flag 褰撳墠鍊硷紙鍏煎 NULL锛夛紝缁熶竴缃负 1
+     */
+    public int removeByIds(@Param("ids") Long[] ids);
 
-    public List<SpStatChange> getListBySpStatChange(@Param("PAHOSPITALNO") String PAHOSPITALNO, @Param("PACHAGEFLAG") String PACHAGEFLAG);
+
+    public List<SpStatChange> getListBySpStatChange(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PAHOSPITALNAME") String PAHOSPITALNAME);
+
+    public List<SpStatChangeDetail> getSpStatChangeDetail(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PAHOSPITALNAME") String PAHOSPITALNAME, @Param("PACHARGESTATE") String PACHARGESTATE);
 
 }

--
Gitblit v1.9.3