From 86178df7a9b1af5014f2d16bd0a0140717ab10fc Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 20 五月 2026 14:35:52 +0800
Subject: [PATCH] 捐献上报新增ICU评估医生、ICU评估医生手机号
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceEthicalreviewopinionsServiceImpl.java | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 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 0be0d91..3fe36f9 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
@@ -14,6 +14,8 @@
import com.ruoyi.project.common.CalculateDateUtils;
import com.ruoyi.project.domain.ServiceDonationwitness;
import com.ruoyi.project.domain.vo.EthicalReviewVO;
+import com.ruoyi.project.domain.vo.EthicalreviewopinionsStateTotalVO;
+import com.ruoyi.project.domain.vo.EthicalreviewopinionsTotalVO;
import com.ruoyi.project.domain.vo.MedicalEvaluationVO;
import com.ruoyi.project.mapper.ServiceDonationwitnessMapper;
import lombok.extern.slf4j.Slf4j;
@@ -148,7 +150,12 @@
if (StringUtils.isNotEmpty(serviceEthicalreviewopinions.getOrganType())) {
wrappers.eq(ServiceEthicalreviewopinions::getOrganType, serviceEthicalreviewopinions.getOrganType());
}
-
+ if (ObjectUtils.isNotEmpty(serviceEthicalreviewopinions.getNitiateId())) {
+ wrappers.eq(ServiceEthicalreviewopinions::getNitiateId, serviceEthicalreviewopinions.getNitiateId());
+ }
+ if (ObjectUtils.isNotEmpty(serviceEthicalreviewopinions.getExpertNo())) {
+ wrappers.eq(ServiceEthicalreviewopinions::getExpertNo, serviceEthicalreviewopinions.getExpertNo());
+ }
int currentPage = (serviceEthicalreviewopinions.getPageNum() == null || serviceEthicalreviewopinions.getPageNum() < 1) ? 1 : serviceEthicalreviewopinions.getPageNum();
int size = (serviceEthicalreviewopinions.getPageSize() == null || serviceEthicalreviewopinions.getPageSize() < 1) ? 10 : serviceEthicalreviewopinions.getPageSize();
Page<ServiceEthicalreviewopinions> page = new Page<>(currentPage, size);
@@ -161,17 +168,7 @@
@Override
public List<EthicalReviewVO> selectVOList(EthicalReviewVO ethicalReviewVO) {
- SysUser user = SecurityUtils.getLoginUser().getUser();
- List<SysRole> l = user.getRoles();
- Boolean b = false;
- for (SysRole r : l) {
- if (r.getRoleId().longValue() == 3) {
- b = true;
- }
- }
- if (b) {
- ethicalReviewVO.setReporterno(user.getUserName());
- }
+
List<EthicalReviewVO> ethicalReviewVOS = serviceEthicalreviewopinionsMapper.selectVOList(ethicalReviewVO);
for (EthicalReviewVO ethicalReviewVO1 : ethicalReviewVOS) {
@@ -202,4 +199,23 @@
return ethicalReviewVOS;
}
+ public List<EthicalreviewopinionsTotalVO> expertTotal(String expertNo) {
+
+ return serviceEthicalreviewopinionsMapper.expertTotal(expertNo);
+ }
+
+ public Integer updateTimeOut() {
+ return serviceEthicalreviewopinionsMapper.updateTimeOut();
+ }
+
+ public List<EthicalreviewopinionsStateTotalVO> stateTotal(String expertNo) {
+
+ return serviceEthicalreviewopinionsMapper.stateTotal(expertNo);
+ }
+
+ public EthicalreviewopinionsStateTotalVO stateTotalAll(String nitiateId) {
+
+ return serviceEthicalreviewopinionsMapper.stateTotalAll(nitiateId);
+ }
+
}
--
Gitblit v1.9.3