From b44e27d3cca665d55e86c1a46d03aa560bcf0774 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期四, 15 十月 2026 16:59:51 +0800
Subject: [PATCH] 捐献基础修改保存判断
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 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 d2eb5f4..75e42d7 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);
// 鐒跺悗杩涜鍊掑簭鎺掑簭
@@ -121,27 +122,49 @@
//灏唕eport鏁版嵁澶嶅埗鍒皊erviceDonatebaseinfo涓�
ServiceDonatebaseinfo serviceDonatebaseinfo1 = DtoConversionUtils.sourceToTarget(serviceDonatebaseinfoReport, ServiceDonatebaseinfo.class);
serviceDonatebaseinfo1.setId(null);
+ serviceDonatebaseinfo1.setReportId(serviceDonatebaseinfoReport.getId());
serviceDonatebaseinfo1.setReporterno(serviceDonatebaseinfoReport.getCoordinatorNo());
serviceDonatebaseinfo1.setReportername(serviceDonatebaseinfoReport.getCoordinatorName());
serviceDonatebaseinfo1.setCurrentHospital(serviceDonatebaseinfoReport.getToHospital());
serviceDonatebaseinfo1.setReportername(serviceDonatebaseinfoReport.getCoordinatorName());
+ 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.setRegistercountyname(serviceDonatebaseinfoReport.getRegisterCountyName());
+ serviceDonatebaseinfo1.setCaseNo(serviceDonatebaseinfo1.getCaseNo());
//鍏堥�氳繃caseNo鏌ヨ鏄惁瀛樺湪
ServiceDonatebaseinfo serviceDonatebaseinfo = new ServiceDonatebaseinfo();
serviceDonatebaseinfo.setCaseNo(serviceDonatebaseinfoReport.getCaseNo());
+ serviceDonatebaseinfo1.setWorkflow(2);
List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo);
if (CollectionUtils.isNotEmpty(serviceDonatebaseinfos) && serviceDonatebaseinfos.size() > 0) {
serviceDonatebaseinfo1.setId(serviceDonatebaseinfos.get(0).getId());
serviceDonatebaseinfo1.setUpdateTime(new Date());
serviceDonatebaseinfoService.updateById(serviceDonatebaseinfo1);
return true;
+ }else {
+ //鍒涘缓
+ serviceDonatebaseinfo1.setDonatetime(new Date());
+ return serviceDonatebaseinfoService.save(serviceDonatebaseinfo1);
}
- //鍒涘缓
- serviceDonatebaseinfo1.setDonatetime(new Date());
- return serviceDonatebaseinfoService.save(serviceDonatebaseinfo1);
}
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());
}
@@ -293,6 +316,9 @@
wrappers.eq(ServiceDonatebaseinfoReport::getCoordinatorNo, serviceDonatebaseinfoReport.getCoordinatorNo());
}
+ if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getNotAdminId())) {
+ wrappers.eq(ServiceDonatebaseinfoReport::getCreateBy, serviceDonatebaseinfoReport.getNotAdminId());
+ }
return wrappers;
}
--
Gitblit v1.9.3