diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index ac555c9aa..d828b73ee 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -12913,9 +12913,6 @@ Setting页面 为 site 勾选CRC用户列表 - - 项目参与人员退出 其中IQC退出 回去释放工作量 - 分页获取临床项目列表 默认后台加急状态为3 查所有的 diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs index 7e25fdaf9..3d3064922 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs @@ -346,6 +346,14 @@ namespace IRaCIS.Core.Application.Service { //有该人员 + if (findTrialUser.IsDeleted == true) + { + findTrialUser.IsDeleted = false; + findTrialUser.DeletedTime = null; + findTrialUser.RemoveTime = null; + findTrialUser.JoinTime = DateTime.Now; + } + //是否有该角色 foreach (var userTypeId in userTypeIdList) @@ -364,7 +372,6 @@ namespace IRaCIS.Core.Application.Service { findTrialUserRole.IsDeleted = false; findTrialUserRole.DeletedTime = null; - findTrialUserRole.RemoveTime = null; } } diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs index 0b6b8164a..a8d6b7071 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs @@ -204,6 +204,7 @@ namespace IRaCIS.Core.Application.Service if (findTrialuser.IsDeleted = true) { findTrialuser.IsDeleted = false; + findTrialuser.DeletedTime = null; findTrialuser.JoinTime = DateTime.Now; findTrialuser.RemoveTime = null; } @@ -245,45 +246,5 @@ namespace IRaCIS.Core.Application.Service - - - - - - - - /// 项目参与人员退出 其中IQC退出 回去释放工作量 - //[TrialAudit(AuditType.TrialAudit, AuditOptType.DeleteTrailStaff)] - [HttpDelete, Route("{id:guid}/{trialId:guid}/{isDelete:bool}")] - [TrialGlobalLimit("AfterStopCannNotOpt")] - [UnitOfWork] - [Obsolete] - public async Task DeleteMaintenanceUser(Guid id, bool isDelete) - { - - var trialUser = await _trialUseRoleRepository.AsQueryable().IgnoreQueryFilters().FirstOrDefaultAsync(t => t.Id == id); - - if (trialUser == null) return Null404NotFound(trialUser); - - if (await _trialSiteUserRoleRepository.AnyAsync(t => t.UserId == trialUser.UserId && t.TrialId == trialUser.TrialId)) - { - //---人员已加入现场维护 - return ResponseOutput.NotOk(_localizer["TrialMaint_PersonnelJoined"]); - } - - if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.IQC && isDelete) - { - await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.CurrentActionUserId == trialUser.UserId && t.TrialId == trialUser.TrialId && t.IsTake, u => new SubjectVisit() { CurrentActionUserId = null, CurrentActionUserExpireTime = null, IsTake = false }); - } - - await _trialUseRoleRepository.BatchUpdateNoTrackingAsync(t => t.Id == id, u => new TrialUserRole() { IsDeleted = isDelete, RemoveTime = isDelete ? DateTime.Now : null }); - - await _trialUseRoleRepository.SaveChangesAsync(); - - return ResponseOutput.Ok(); - } - - - } } diff --git a/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs b/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs index dfa92be9d..0a4ece20c 100644 --- a/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs +++ b/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs @@ -428,6 +428,16 @@ namespace IRaCIS.Core.Application.Service } else { + + if (findTrialUser.IsDeleted == true) + { + findTrialUser.IsDeleted = false; + findTrialUser.DeletedTime = null; + findTrialUser.RemoveTime = null; + findTrialUser.JoinTime = DateTime.Now; + + } + var findTrialUserRole = findTrialUser.TrialUserRoleList.Where(t => t.UserRole.UserTypeId == userRoleId).FirstOrDefault(); if (findTrialUserRole == null) @@ -441,8 +451,7 @@ namespace IRaCIS.Core.Application.Service if (findTrialUserRole.IsDeleted == true) { findTrialUserRole.IsDeleted = false; - findTrialUserRole.DeletedTime = null; - findTrialUserRole.RemoveTime = null; + findTrialUser.DeletedTime = null; } }