From 1574cc259ecec7217d210c58d2bbf7b44a106234 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 12 九月 2025 20:48:31 +0800
Subject: [PATCH] 通过生日算年龄
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceEthicalreviewopinionsServiceImpl.java | 61 +++++++++++++++++++-----------
1 files changed, 38 insertions(+), 23 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceEthicalreviewopinionsServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceEthicalreviewopinionsServiceImpl.java
index 11cf764..b10bec5 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceEthicalreviewopinionsServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceEthicalreviewopinionsServiceImpl.java
@@ -1,19 +1,25 @@
package com.ruoyi.project.service.impl;
+import java.time.LocalDate;
+import java.time.ZoneId;
import java.util.List;
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.vo.EthicalReviewVO;
+import com.ruoyi.project.domain.vo.MedicalEvaluationVO;
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.ServiceEthicalreviewopinionsMapper;
import com.ruoyi.project.domain.ServiceEthicalreviewopinions;
@@ -26,8 +32,7 @@
* @date 2021-11-23
*/
@Service
-public class ServiceEthicalreviewopinionsServiceImpl extends ServiceImpl<ServiceEthicalreviewopinionsMapper, ServiceEthicalreviewopinions> implements IServiceEthicalreviewopinionsService
-{
+public class ServiceEthicalreviewopinionsServiceImpl extends ServiceImpl<ServiceEthicalreviewopinionsMapper, ServiceEthicalreviewopinions> implements IServiceEthicalreviewopinionsService {
@Autowired
ServiceEthicalreviewopinionsMapper serviceEthicalreviewopinionsMapper;
@@ -42,29 +47,29 @@
@Override
public List<ServiceEthicalreviewopinions> queryList(ServiceEthicalreviewopinions serviceEthicalreviewopinions) {
LambdaQueryWrapper<ServiceEthicalreviewopinions> wrappers = Wrappers.lambdaQuery();
- if (serviceEthicalreviewopinions.getInfoid() != null){
- wrappers.eq(ServiceEthicalreviewopinions::getInfoid ,serviceEthicalreviewopinions.getInfoid());
+ if (serviceEthicalreviewopinions.getInfoid() != null) {
+ wrappers.eq(ServiceEthicalreviewopinions::getInfoid, serviceEthicalreviewopinions.getInfoid());
}
- if (StringUtils.isNotBlank(serviceEthicalreviewopinions.getDonorno())){
- wrappers.eq(ServiceEthicalreviewopinions::getDonorno ,serviceEthicalreviewopinions.getDonorno());
+ if (StringUtils.isNotBlank(serviceEthicalreviewopinions.getDonorno())) {
+ wrappers.eq(ServiceEthicalreviewopinions::getDonorno, serviceEthicalreviewopinions.getDonorno());
}
- if (StringUtils.isNotBlank(serviceEthicalreviewopinions.getExpertopinion())){
- wrappers.eq(ServiceEthicalreviewopinions::getExpertopinion ,serviceEthicalreviewopinions.getExpertopinion());
+ if (StringUtils.isNotBlank(serviceEthicalreviewopinions.getExpertopinion())) {
+ wrappers.eq(ServiceEthicalreviewopinions::getExpertopinion, serviceEthicalreviewopinions.getExpertopinion());
}
- if (serviceEthicalreviewopinions.getExpertconclusion() != null){
- wrappers.eq(ServiceEthicalreviewopinions::getExpertconclusion ,serviceEthicalreviewopinions.getExpertconclusion());
+ if (serviceEthicalreviewopinions.getExpertconclusion() != null) {
+ wrappers.eq(ServiceEthicalreviewopinions::getExpertconclusion, serviceEthicalreviewopinions.getExpertconclusion());
}
- if (StringUtils.isNotBlank(serviceEthicalreviewopinions.getExpertname())){
- wrappers.like(ServiceEthicalreviewopinions::getExpertname ,serviceEthicalreviewopinions.getExpertname());
+ if (StringUtils.isNotBlank(serviceEthicalreviewopinions.getExpertname())) {
+ wrappers.like(ServiceEthicalreviewopinions::getExpertname, serviceEthicalreviewopinions.getExpertname());
}
- if (serviceEthicalreviewopinions.getConclusiontime() != null){
- wrappers.eq(ServiceEthicalreviewopinions::getConclusiontime ,serviceEthicalreviewopinions.getConclusiontime());
+ if (serviceEthicalreviewopinions.getConclusiontime() != null) {
+ wrappers.eq(ServiceEthicalreviewopinions::getConclusiontime, serviceEthicalreviewopinions.getConclusiontime());
}
- if (StringUtils.isNotBlank(serviceEthicalreviewopinions.getConclusionannex())){
- wrappers.eq(ServiceEthicalreviewopinions::getConclusionannex ,serviceEthicalreviewopinions.getConclusionannex());
+ if (StringUtils.isNotBlank(serviceEthicalreviewopinions.getConclusionannex())) {
+ wrappers.eq(ServiceEthicalreviewopinions::getConclusionannex, serviceEthicalreviewopinions.getConclusionannex());
}
- if (serviceEthicalreviewopinions.getConclusionorder() != null){
- wrappers.eq(ServiceEthicalreviewopinions::getConclusionorder ,serviceEthicalreviewopinions.getConclusionorder());
+ if (serviceEthicalreviewopinions.getConclusionorder() != null) {
+ wrappers.eq(ServiceEthicalreviewopinions::getConclusionorder, serviceEthicalreviewopinions.getConclusionorder());
}
return this.list(wrappers);
}
@@ -73,18 +78,28 @@
public List<EthicalReviewVO> selectVOList(EthicalReviewVO ethicalReviewVO) {
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){
+ if (b) {
ethicalReviewVO.setReporterno(user.getUserName());
}
+ List<EthicalReviewVO> ethicalReviewVOS = serviceEthicalreviewopinionsMapper.selectVOList(ethicalReviewVO);
- return serviceEthicalreviewopinionsMapper.selectVOList(ethicalReviewVO);
+ for (EthicalReviewVO ethicalReviewVO1 : ethicalReviewVOS) {
+ if (ethicalReviewVO1.getBirthday() != null) {
+ Map<String, String> map = CalculateDateUtils.calculateAge(ethicalReviewVO1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), LocalDate.now());
+ ethicalReviewVO1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
+ ethicalReviewVO1.setAgeunit(map.get("ageUnit"));
+ ethicalReviewVO1.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
+ ethicalReviewVO1.setAgeunit2(map.get("ageUnit2"));
+ }
+ }
+ return ethicalReviewVOS;
}
}
--
Gitblit v1.9.3