From 4a54dc2ce371d90d19b264238c32efc7b871c772 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期五, 03 七月 2026 15:32:34 +0800
Subject: [PATCH] 获取捐献工作流捐献器官分配状态取错表处理
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 87 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 72 insertions(+), 15 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
index 514758d..ec6ea0c 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
@@ -18,10 +18,7 @@
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.dto.DonatebaseinfoProgressDTO;
import com.ruoyi.project.domain.entity.ServiceDonatemaintenanceEntity;
-import com.ruoyi.project.domain.vo.DonatebaseinfoProgressVO;
-import com.ruoyi.project.domain.vo.TimeVO;
-import com.ruoyi.project.domain.vo.WorkFlowVO;
-import com.ruoyi.project.domain.vo.countByRecordStateVO;
+import com.ruoyi.project.domain.vo.*;
import com.ruoyi.project.mapper.*;
import com.ruoyi.project.service.*;
import com.ruoyi.system.mapper.SysUserMapper;
@@ -65,6 +62,9 @@
private IServiceMedicalevaluationService serviceMedicalevaluationService;
@Autowired
+ private IServiceMedicalevaluationorganService serviceMedicalevaluationServiceorgan;
+
+ @Autowired
private IServiceRelativesconfirmationService serviceRelativesconfirmationService;
@Autowired
@@ -74,10 +74,16 @@
private IServiceEthicalreviewopinionsService iServiceEthicalreviewopinionsService;
@Autowired
+ private IServiceEthicalreviewinitiateService iServiceEthicalreviewinitiateService;
+
+ @Autowired
private IServiceOrganallocationService serviceOrganallocationService;
@Autowired
private IServiceDonateorganService serviceDonateorganService;
+
+ @Autowired
+ private IServiceDonateorganBaseService serviceDonateorganBaseService;
@Autowired
private IServiceDonationwitnessService serviceDonationwitnessService;
@@ -426,25 +432,25 @@
//灏佽鍣ㄥ畼鍒嗛厤
Map<String, Object> donateorgansService = new HashMap<>();
// if (serviceDonatebaseinfo.getWorkflow() >= 4) {
- ServiceDonateorgan serviceDonateorgan = new ServiceDonateorgan();
+ ServiceDonateorganBase serviceDonateorgan = new ServiceDonateorganBase();
serviceDonateorgan.setInfoid(id);
- List<ServiceDonateorgan> serviceDonateorgans = serviceDonateorganService.queryList(serviceDonateorgan);
- log.info("妫�鏌erviceDonateorgans鐨勫�间负锛歿}", serviceDonateorgans.size());
- if (!CollectionUtils.isEmpty(serviceDonateorgans)) {
- donateorgansService.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateorgans.get(0).getCreateTime()));
- donateorgansService.put("updatetime", serviceDonateorgans.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateorgans.get(0).getUpdateTime()) : "");
+ Page<ServiceDonateorganBase> serviceDonateorgans = serviceDonateorganBaseService.queryList(serviceDonateorgan);
+ log.info("妫�鏌erviceDonateorgans鐨勫�间负锛歿}", serviceDonateorgans.getRecords().size());
+ if (serviceDonateorgans.getRecords().size()>0) {
+ donateorgansService.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateorgans.getRecords().get(0).getCreateTime()));
+ donateorgansService.put("updatetime", serviceDonateorgans.getRecords().get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateorgans.getRecords().get(0).getUpdateTime()) : "");
donateorgansService.put("createperson", null);
- donateorgansService.put("state", StringUtils.nullTo1(serviceDonateorgans.get(0).getAllocationstatus()));
- if (StringUtils.isNotBlank(serviceDonateorgans.get(0).getCreateBy())) {
- SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonateorgans.get(0).getCreateBy());
+ donateorgansService.put("state", StringUtils.nullTo1(serviceDonateorgans.getRecords().get(0).getAllocationStatus()));
+ if (StringUtils.isNotBlank(serviceDonateorgans.getRecords().get(0).getCreateBy())) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonateorgans.getRecords().get(0).getCreateBy());
if (!ObjectUtils.isEmpty(sysUser)) {
donateorgansService.put("createperson", sysUser.getNickName());
}
}
donateorgansService.put("updateperson", null);
- if (StringUtils.isNotBlank(serviceDonateorgans.get(0).getUpdateBy())) {
- SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonateorgans.get(0).getUpdateBy());
+ if (StringUtils.isNotBlank(serviceDonateorgans.getRecords().get(0).getUpdateBy())) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonateorgans.getRecords().get(0).getUpdateBy());
if (!ObjectUtils.isEmpty(sysUser)) {
donateorgansService.put("updateperson", sysUser.getNickName());
}
@@ -632,5 +638,56 @@
wrappers.between(ServiceDonatebaseinfo::getReporttime, params.get("beginReporttime"), params.get("endReporttime"));
}
}
+ public FileListVO fileList(Long infoId){
+ FileListVO fileList=new FileListVO();
+ //渚涜�呯淮鎶�
+ ServiceDonatemaintenanceEntity serviceDonatemaintenanceEntity=new ServiceDonatemaintenanceEntity();
+ serviceDonatemaintenanceEntity.setInfoid(infoId);
+ List<ServiceDonatemaintenanceEntity> donatemaintenanceEntityList= serviceDonatemaintenanceService.queryList(serviceDonatemaintenanceEntity).getRecords();
+ fileList.setDonatemaintenance(donatemaintenanceEntityList);
+
+ //鎹愮尞纭
+ ServiceRelativesconfirmation serviceRelativesconfirmation = new ServiceRelativesconfirmation();
+ serviceRelativesconfirmation.setInfoid(infoId);
+ List<ServiceRelativesconfirmation> serviceRelativesconfirmations = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation);
+ fileList.setRelativesconfirmation(serviceRelativesconfirmations);
+
+ //鍖诲璇勪及
+ ServiceMedicalevaluationorgan serviceMedicalevaluation = new ServiceMedicalevaluationorgan();
+ serviceMedicalevaluation.setInfoid(infoId);
+ List<ServiceMedicalevaluationorgan> serviceMedicalevaluations = serviceMedicalevaluationServiceorgan.queryList(serviceMedicalevaluation);
+ fileList.setMedicalevaluation(serviceMedicalevaluations);
+
+ //姝讳骸鍒ゅ畾
+ ServiceDeathinfo serviceDeathinfo =new ServiceDeathinfo();
+ serviceDeathinfo.setInfoid(infoId);
+ List<ServiceDeathinfo> serviceDeathinfoList= serviceDeathinfoService.queryList(serviceDeathinfo).getRecords();
+ fileList.setDeathinfo(serviceDeathinfoList);
+
+ //浼︾悊瀹℃煡
+ ServiceEthicalreviewinitiate serviceDonateflowchart = new ServiceEthicalreviewinitiate();
+ serviceDonateflowchart.setInfoid(infoId);
+ List<ServiceEthicalreviewinitiate> serviceEthicalreviewinitiateList = iServiceEthicalreviewinitiateService.queryList(serviceDonateflowchart);
+ fileList.setDonateflowcharts(serviceEthicalreviewinitiateList);
+
+ //鍣ㄥ畼鍒嗛厤
+ ServiceDonateorganBase serviceDonateorgan = new ServiceDonateorganBase();
+ serviceDonateorgan.setInfoid(infoId);
+ List<ServiceDonateorganBase> serviceDonateorgans = serviceDonateorganBaseService.queryList(serviceDonateorgan).getRecords();
+ fileList.setDonateorgans(serviceDonateorgans);
+
+ //鍣ㄧ鑾峰彇
+ ServiceDonationwitness serviceDonationwitness=new ServiceDonationwitness();
+ serviceDonationwitness.setInfoid(infoId);
+ List<ServiceDonationwitness> serviceDonationwitnesss = serviceDonationwitnessService.queryList(serviceDonationwitness);
+ fileList.setDonationwitness(serviceDonationwitnesss);
+
+ //鍣ㄧ鍒╃敤
+ ServiceDonatecompletioninfo serviceDonatecompletioninfo = new ServiceDonatecompletioninfo();
+ serviceDonatecompletioninfo.setInfoid(infoId);
+ List<ServiceDonatecompletioninfo> serviceDonatecompletioninfos = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo);
+ fileList.setDonatecompletioninfo(serviceDonatecompletioninfos);
+ return fileList;
+ }
}
--
Gitblit v1.9.3