From 8b79668682581fa6de34cb4239b726c1c90b05c0 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 15 七月 2026 15:57:32 +0800
Subject: [PATCH] 上报短信不用附件

---
 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
index 04be80a..9b7a4d6 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
@@ -50,6 +50,7 @@
     @Override
     public Page<ServiceDonatebaseinfoReport> queryList(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
         LambdaQueryWrapper<ServiceDonatebaseinfoReport> wrappers = getWrapper(serviceDonatebaseinfoReport);
+
         // 娣诲姞create_time涓嶄负绌虹殑鏉′欢
         wrappers.isNotNull(ServiceDonatebaseinfoReport::getCreateTime);
         // 鐒跺悗杩涜鍊掑簭鎺掑簭
@@ -140,6 +141,8 @@
         serviceDonatebaseinfo1.setRegisterprovincename(serviceDonatebaseinfoReport.getRegisterprovincename());
         serviceDonatebaseinfo1.setRegistercityname(serviceDonatebaseinfoReport.getRegistercityname());
         serviceDonatebaseinfo1.setRegistertown(serviceDonatebaseinfoReport.getRegistertownname());
+        serviceDonatebaseinfo1.setReportHospital(serviceDonatebaseinfoReport.getToHospital());
+        serviceDonatebaseinfo1.setFirstDept(serviceDonatebaseinfoReport.getDeptName());
         //鍏堥�氳繃caseNo鏌ヨ鏄惁瀛樺湪
         ServiceDonatebaseinfo serviceDonatebaseinfo = new ServiceDonatebaseinfo();
         serviceDonatebaseinfo.setCaseNo(serviceDonatebaseinfoReport.getCaseNo());
@@ -157,6 +160,7 @@
 
     private LambdaQueryWrapper<ServiceDonatebaseinfoReport> getWrapper(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
         LambdaQueryWrapper<ServiceDonatebaseinfoReport> wrappers = Wrappers.lambdaQuery();
+        wrappers.eq(ServiceDonatebaseinfoReport::getDelFlag, "0");
         if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getCaseNo())) {
             wrappers.eq(ServiceDonatebaseinfoReport::getCaseNo, serviceDonatebaseinfoReport.getCaseNo());
         }
@@ -308,6 +312,9 @@
             wrappers.eq(ServiceDonatebaseinfoReport::getCoordinatorNo, serviceDonatebaseinfoReport.getCoordinatorNo());
         }
 
+        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getNotAdminId())) {
+            wrappers.eq(ServiceDonatebaseinfoReport::getCreateBy, serviceDonatebaseinfoReport.getNotAdminId());
+        }
         return wrappers;
     }
 

--
Gitblit v1.9.3