修改中心调研限制条件
parent
4200daa1b9
commit
8c5cca7ba5
|
@ -705,7 +705,9 @@ namespace IRaCIS.Core.Application.Contracts
|
||||||
throw new BusinessValidationFailedException("当前调研表已废除,或者调研表状态已锁定,不允许操作");
|
throw new BusinessValidationFailedException("当前调研表已废除,或者调研表状态已锁定,不允许操作");
|
||||||
}
|
}
|
||||||
|
|
||||||
var siteUserList = await _trialSiteUserSurveyRepository.Where(t => t.TrialSiteSurvey.TrialId == trialId && t.TrialSiteSurvey.SiteId == trialSiteSurvey.SiteId && t.TrialSiteSurvey.IsDeleted == false).Select(t =>
|
var siteUserList = await _trialSiteUserSurveyRepository.Where(t => t.TrialSiteSurveyId == trialSiteSurveyId)
|
||||||
|
.Where(t=>!(t.IsHistoryUser && t.IsHistoryUserDeleted==true))
|
||||||
|
.Select(t =>
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
t.TrialSiteSurveyId,
|
t.TrialSiteSurveyId,
|
||||||
|
@ -714,7 +716,7 @@ namespace IRaCIS.Core.Application.Contracts
|
||||||
t.UserTypeId,
|
t.UserTypeId,
|
||||||
UserTypeEnum = (UserTypeEnum?)t.UserTypeRole.UserTypeEnum,
|
UserTypeEnum = (UserTypeEnum?)t.UserTypeRole.UserTypeEnum,
|
||||||
t.TrialRoleCode,
|
t.TrialRoleCode,
|
||||||
t.Email
|
t.Email,
|
||||||
}). ToListAsync();
|
}). ToListAsync();
|
||||||
|
|
||||||
|
|
||||||
|
@ -723,11 +725,6 @@ namespace IRaCIS.Core.Application.Contracts
|
||||||
var currentUserList = siteUserList.Where(t => t.TrialSiteSurveyId == trialSiteSurveyId).ToList();
|
var currentUserList = siteUserList.Where(t => t.TrialSiteSurveyId == trialSiteSurveyId).ToList();
|
||||||
|
|
||||||
|
|
||||||
//if (!currentUserList.Any(t => t.TrialRoleCode == 1) || !currentUserList.Any(t => t.TrialRoleCode == 5))
|
|
||||||
//{
|
|
||||||
// throw new BusinessValidationFailedException("本次提交,必须有CRC和影像阅片人信息");
|
|
||||||
//}
|
|
||||||
|
|
||||||
|
|
||||||
if (!currentUserList.Any(t => t.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator) ||
|
if (!currentUserList.Any(t => t.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator) ||
|
||||||
!currentUserList.Any(t => t.UserTypeEnum == UserTypeEnum.SR))
|
!currentUserList.Any(t => t.UserTypeEnum == UserTypeEnum.SR))
|
||||||
|
|
Loading…
Reference in New Issue