From e842ed74b3167075e4f8f0cf76b38ddc53a8fb54 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 12 九月 2025 22:18:48 +0800
Subject: [PATCH] 日志修改
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java | 95 ++++++++++++++++++++++++++++-------------------
1 files changed, 56 insertions(+), 39 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java
index a5136dc..1d56129 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java
@@ -1,23 +1,31 @@
package com.ruoyi.project.service.impl;
+import java.time.LocalDate;
+import java.time.ZoneId;
import java.util.List;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.project.common.CalculateDateUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
+import com.ruoyi.project.domain.ServiceDonateorgan;
import com.ruoyi.project.domain.vo.DonationWitnessVO;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.domain.vo.WitnessStatsVO;
import com.ruoyi.project.mapper.ServiceDonatebaseinfoMapper;
+import com.ruoyi.project.mapper.ServiceDonateorganMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
import java.util.ArrayList;
import java.util.Map;
+
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.mapper.ServiceDonationwitnessMapper;
import com.ruoyi.project.domain.ServiceDonationwitness;
@@ -25,13 +33,12 @@
/**
* 鎹愮尞瑙佽瘉Service涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
* @date 2021-11-17
*/
@Service
-public class ServiceDonationwitnessServiceImpl extends ServiceImpl<ServiceDonationwitnessMapper, ServiceDonationwitness> implements IServiceDonationwitnessService
-{
+public class ServiceDonationwitnessServiceImpl extends ServiceImpl<ServiceDonationwitnessMapper, ServiceDonationwitness> implements IServiceDonationwitnessService {
@Autowired
@@ -40,23 +47,26 @@
@Autowired
ServiceDonatebaseinfoMapper serviceDonatebaseinfoMapper;
+ @Autowired
+ ServiceDonateorganServiceImpl serviceDonateorganService;
+
/**
* 鏌ヨ鎹愮尞瑙佽瘉鍒楄〃
- *
+ *
* @param serviceDonationwitness 鎹愮尞瑙佽瘉
* @return 鎹愮尞瑙佽瘉
*/
@Override
public List<ServiceDonationwitness> queryList(ServiceDonationwitness serviceDonationwitness) {
LambdaQueryWrapper<ServiceDonationwitness> wrappers = Wrappers.lambdaQuery();
- if (StringUtils.isNotBlank(serviceDonationwitness.getDonorno())){
- wrappers.eq(ServiceDonationwitness::getDonorno ,serviceDonationwitness.getDonorno());
+ if (StringUtils.isNotBlank(serviceDonationwitness.getDonorno())) {
+ wrappers.eq(ServiceDonationwitness::getDonorno, serviceDonationwitness.getDonorno());
}
- if (StringUtils.isNotBlank(serviceDonationwitness.getGainhospitalname())){
- wrappers.like(ServiceDonationwitness::getGainhospitalname ,serviceDonationwitness.getGainhospitalname());
+ if (StringUtils.isNotBlank(serviceDonationwitness.getGainhospitalname())) {
+ wrappers.like(ServiceDonationwitness::getGainhospitalname, serviceDonationwitness.getGainhospitalname());
}
- if (StringUtils.isNotBlank(serviceDonationwitness.getOperationdoctor())){
- wrappers.eq(ServiceDonationwitness::getOperationdoctor ,serviceDonationwitness.getOperationdoctor());
+ if (StringUtils.isNotBlank(serviceDonationwitness.getOperationdoctor())) {
+ wrappers.eq(ServiceDonationwitness::getOperationdoctor, serviceDonationwitness.getOperationdoctor());
}
return this.list(wrappers);
}
@@ -65,18 +75,27 @@
public List<DonationWitnessVO> selectVOList(DonationWitnessVO donationWitnessVO) {
SysUser user = SecurityUtils.getLoginUser().getUser();
- List <SysRole> l = user.getRoles();
+ List<SysRole> l = user.getRoles();
Boolean b = false;
- for(SysRole r : l){
- if(r.getRoleId().longValue() == 3){
+ for (SysRole r : l) {
+ if (r.getRoleId().longValue() == 3) {
b = true;
}
}
- if(b){
- donationWitnessVO.setBasecreateby(user.getUserName());
+ if (b) {
+ donationWitnessVO.setReporterno(user.getUserName());
}
-
- return serviceDonationwitnessMapper.selectVOList(donationWitnessVO);
+ List<DonationWitnessVO> donationWitnessVOS = serviceDonationwitnessMapper.selectVOList(donationWitnessVO);
+ for (DonationWitnessVO donationWitnessVO1 : donationWitnessVOS) {
+ if (donationWitnessVO1.getBirthday() != null) {
+ Map<String, String> map = CalculateDateUtils.calculateAge(donationWitnessVO1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), LocalDate.now());
+ donationWitnessVO1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
+ donationWitnessVO1.setAgeunit(map.get("ageUnit"));
+ donationWitnessVO1.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
+ donationWitnessVO1.setAgeunit2(map.get("ageUnit2"));
+ }
+ }
+ return donationWitnessVOS;
}
@Override
@@ -111,63 +130,63 @@
int XONumber = 0;
int XABNumber = 0;
int DothersNumber = 0;
- for(ServiceDonationwitness l : list){
+ for (ServiceDonationwitness l : list) {
ServiceDonatebaseinfo serviceDonatebaseinfo = serviceDonatebaseinfoMapper.getById(l.getInfoid());
- if(serviceDonatebaseinfo.getSex() != null && serviceDonatebaseinfo.getSex().equals("1")){
+ if (serviceDonatebaseinfo.getSex() != null && serviceDonatebaseinfo.getSex().equals("1")) {
manNumber++;
}
- if(serviceDonatebaseinfo.getSex() != null && serviceDonatebaseinfo.getSex().equals("2")){
+ if (serviceDonatebaseinfo.getSex() != null && serviceDonatebaseinfo.getSex().equals("2")) {
womanNumber++;
}
- if(serviceDonatebaseinfo.getDiseasetype() != null && serviceDonatebaseinfo.getDiseasetype().equals("0")){
+ if (serviceDonatebaseinfo.getDiseasetype() != null && serviceDonatebaseinfo.getDiseasetype().equals("0")) {
D0Number++;
}
- if(serviceDonatebaseinfo.getDiseasetype() != null && serviceDonatebaseinfo.getDiseasetype().equals("1")){
+ if (serviceDonatebaseinfo.getDiseasetype() != null && serviceDonatebaseinfo.getDiseasetype().equals("1")) {
D1Number++;
}
- if(serviceDonatebaseinfo.getDiseasetype() != null && serviceDonatebaseinfo.getDiseasetype().equals("2")){
+ if (serviceDonatebaseinfo.getDiseasetype() != null && serviceDonatebaseinfo.getDiseasetype().equals("2")) {
D2Number++;
}
- if(serviceDonatebaseinfo.getDiseasetype() != null && serviceDonatebaseinfo.getDiseasetype().equals("3")){
+ if (serviceDonatebaseinfo.getDiseasetype() != null && serviceDonatebaseinfo.getDiseasetype().equals("3")) {
D3Number++;
}
- if(serviceDonatebaseinfo.getDiseasetype() != null && serviceDonatebaseinfo.getDiseasetype().equals("4")){
+ if (serviceDonatebaseinfo.getDiseasetype() != null && serviceDonatebaseinfo.getDiseasetype().equals("4")) {
D4Number++;
}
- if(l.getDonationcategory() != null && l.getDonationcategory().equals("DBD")){
+ if (l.getDonationcategory() != null && l.getDonationcategory().equals("DBD")) {
DBDNumber++;
}
- if(l.getDonationcategory() != null && l.getDonationcategory().equals("DCD")){
+ if (l.getDonationcategory() != null && l.getDonationcategory().equals("DCD")) {
DCDNumber++;
}
- if(l.getDonationcategory() != null && l.getDonationcategory().equals("DBCD")){
+ if (l.getDonationcategory() != null && l.getDonationcategory().equals("DBCD")) {
DBCDNumber++;
}
- if(serviceDonatebaseinfo.getAge() != null && serviceDonatebaseinfo.getAge() >= 0 && serviceDonatebaseinfo.getAge() <= 17){
+ if (serviceDonatebaseinfo.getAge() != null && serviceDonatebaseinfo.getAge() >= 0 && serviceDonatebaseinfo.getAge() <= 17) {
A1Number++;
}
- if(serviceDonatebaseinfo.getAge() != null && serviceDonatebaseinfo.getAge() >= 18 && serviceDonatebaseinfo.getAge() <= 48){
+ if (serviceDonatebaseinfo.getAge() != null && serviceDonatebaseinfo.getAge() >= 18 && serviceDonatebaseinfo.getAge() <= 48) {
A2Number++;
}
- if(serviceDonatebaseinfo.getAge() != null && serviceDonatebaseinfo.getAge() >= 49 && serviceDonatebaseinfo.getAge() <= 69){
+ if (serviceDonatebaseinfo.getAge() != null && serviceDonatebaseinfo.getAge() >= 49 && serviceDonatebaseinfo.getAge() <= 69) {
A3Number++;
}
- if(serviceDonatebaseinfo.getBloodtype() != null && serviceDonatebaseinfo.getBloodtype().equals("1")){
+ if (serviceDonatebaseinfo.getBloodtype() != null && serviceDonatebaseinfo.getBloodtype().equals("1")) {
XANumber++;
}
- if(serviceDonatebaseinfo.getBloodtype() != null && serviceDonatebaseinfo.getBloodtype().equals("2")){
+ if (serviceDonatebaseinfo.getBloodtype() != null && serviceDonatebaseinfo.getBloodtype().equals("2")) {
XBNumber++;
}
- if(serviceDonatebaseinfo.getBloodtype() != null && serviceDonatebaseinfo.getBloodtype().equals("3")){
+ if (serviceDonatebaseinfo.getBloodtype() != null && serviceDonatebaseinfo.getBloodtype().equals("3")) {
XONumber++;
}
- if(serviceDonatebaseinfo.getBloodtype() != null && serviceDonatebaseinfo.getBloodtype().equals("4")){
+ if (serviceDonatebaseinfo.getBloodtype() != null && serviceDonatebaseinfo.getBloodtype().equals("4")) {
XABNumber++;
}
}
DothersNumber = total - D0Number - D1Number - D2Number - D3Number - D4Number;
- if(total == 0){
+ if (total == 0) {
w.setManRate(0);
w.setWomanRate(0);
w.setD0Rate(0);
@@ -187,9 +206,7 @@
w.setXORate(0);
w.setXABRate(0);
- }
-
- else{
+ } else {
w.setManRate((double) manNumber / (double) total);
w.setWomanRate((double) womanNumber / (double) total);
w.setD0Rate((double) D0Number / (double) total);
--
Gitblit v1.9.3