From 7156c5ac2b953c7d82d09d41b8efd3487c0ef26d Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 15 七月 2026 16:21:26 +0800
Subject: [PATCH] 上报短信不用附件
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java | 19 +++++++++++++++++++
1 files changed, 19 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 b8e392e..1c3045a 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);
// 鐒跺悗杩涜鍊掑簭鎺掑簭
@@ -129,6 +130,20 @@
serviceDonatebaseinfo1.setBloodtype(serviceDonatebaseinfoReport.getBloodType());
serviceDonatebaseinfo1.setRhyin(serviceDonatebaseinfoReport.getRhYin());
serviceDonatebaseinfo1.setRecordstate("0");
+ serviceDonatebaseinfo1.setInpatientno(null);
+ serviceDonatebaseinfo1.setTreatmentdeptname(serviceDonatebaseinfoReport.getTreatmentdeptname());
+ serviceDonatebaseinfo1.setTreatmenthospitalname(serviceDonatebaseinfoReport.getTreatmenthospitalname());
+ serviceDonatebaseinfo1.setResidenceprovince(serviceDonatebaseinfoReport.getResidenceprovince());
+ serviceDonatebaseinfo1.setResidenceprovincename(serviceDonatebaseinfoReport.getResidenceprovincename());
+ serviceDonatebaseinfo1.setResidencecityname(serviceDonatebaseinfoReport.getRegistercityname());
+ serviceDonatebaseinfo1.setResidencetownname(serviceDonatebaseinfoReport.getResidencetownname());
+ serviceDonatebaseinfo1.setRegisterprovince(serviceDonatebaseinfoReport.getRegisterprovince());
+ serviceDonatebaseinfo1.setRegisterprovincename(serviceDonatebaseinfoReport.getRegisterprovincename());
+ serviceDonatebaseinfo1.setRegistercityname(serviceDonatebaseinfoReport.getRegistercityname());
+ serviceDonatebaseinfo1.setRegistertown(serviceDonatebaseinfoReport.getRegistertownname());
+ serviceDonatebaseinfo1.setReportHospital(serviceDonatebaseinfoReport.getToHospital());
+ serviceDonatebaseinfo1.setFirstDept(serviceDonatebaseinfoReport.getDeptName());
+ serviceDonatebaseinfo1.setCaseNo(null);
//鍏堥�氳繃caseNo鏌ヨ鏄惁瀛樺湪
ServiceDonatebaseinfo serviceDonatebaseinfo = new ServiceDonatebaseinfo();
serviceDonatebaseinfo.setCaseNo(serviceDonatebaseinfoReport.getCaseNo());
@@ -146,6 +161,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());
}
@@ -297,6 +313,9 @@
wrappers.eq(ServiceDonatebaseinfoReport::getCoordinatorNo, serviceDonatebaseinfoReport.getCoordinatorNo());
}
+ if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getNotAdminId())) {
+ wrappers.eq(ServiceDonatebaseinfoReport::getCreateBy, serviceDonatebaseinfoReport.getNotAdminId());
+ }
return wrappers;
}
--
Gitblit v1.9.3