diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs index 92cb9c490..a08d0240f 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs @@ -324,7 +324,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc } - return ResponseOutput.Ok(list, new { TrialModality = criterionInfo.Modalitys }); + return ResponseOutput.Ok(list, new { TrialModality = criterionInfo.Modalitys , IsReadingTaskViewInOrder = criterionInfo.IsReadingTaskViewInOrder }); } diff --git a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs index b6898d36d..16c5e2e3f 100644 --- a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs @@ -127,9 +127,9 @@ namespace IRaCIS.Core.Application.Service.Inspection join trialSign in _trialSignRepository.Where().IgnoreQueryFilters() on data.SignId equals trialSign.Id into trialSigntemp from lefttrialSign in trialSigntemp.DefaultIfEmpty() join leftfrontAuditConfig in _frontAuditConfigRepository.Where().Where(x => x.ConfigType == "M" && x.Identification != null && x.IsEnable == true) on - data.Identification.ToLower() + data.Identification equals - leftfrontAuditConfig.Identification.ToLower() + leftfrontAuditConfig.Identification join moduleTypec in _dictionaryRepository.Where() on new { ModuleType = leftfrontAuditConfig.ModuleTypeId!.Value } equals new { ModuleType = moduleTypec.Id } into moduleTypectemp from leftmoduleTypec in moduleTypectemp.DefaultIfEmpty() join OptTypec in _dictionaryRepository.Where() on new { ModuleType = leftfrontAuditConfig.OptTypeId!.Value } equals new { ModuleType = OptTypec.Id } into optTypetemp diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs index 39cbef3c4..d9e7f7244 100644 --- a/IRaCIS.Core.Application/Service/Management/UserService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserService.cs @@ -263,6 +263,8 @@ namespace IRaCIS.Core.Application.Service IsFirstAdd = false, + IsNeedResetPwd = false, + EmailToken = String.Empty }, true); @@ -449,9 +451,9 @@ namespace IRaCIS.Core.Application.Service catch (Exception) { - + } - + var find = await _identityUserRepository.FindAsync(identityUserId); @@ -1279,7 +1281,7 @@ namespace IRaCIS.Core.Application.Service PermissionStr = t.UserTypeRole.PermissionStr, UserName = t.IdentityUser.UserName, UserTypeShortName = t.UserTypeRole.UserTypeShortName, - UserWorkLanguage=t.IdentityUser.UserWorkLanguage + UserWorkLanguage = t.IdentityUser.UserWorkLanguage }).FirstOrDefaultAsync(); await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = userTokenInfo.IdentityUserId, ActionUserName = $"{userTokenInfo.UserName}", ActionUserType = userTokenInfo.UserTypeShortName, OptType = UserOptType.LoginSelectRole }, true); diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs index 5c58f7b63..d3d722b04 100644 --- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs +++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs @@ -830,7 +830,8 @@ namespace IRaCIS.Core.Application.Contracts } - + var config = await _trialRepository.Where(t => t.Id == trialSiteSurvey.TrialId).Select(t => t.TrialExtraConfigJsonStr).FirstOrDefaultAsync(); + var extralConfig = JsonConvert.DeserializeObject(config); var siteUserList = await _trialSiteUserSurveyRepository.Where(t => t.TrialSiteSurveyId == trialSiteSurveyId) .Where(t => !(t.IsHistoryUser && t.IsHistoryUserDeleted == true)) @@ -849,7 +850,7 @@ namespace IRaCIS.Core.Application.Contracts //var currentUserList = siteUserList.Where(t => t.TrialSiteSurveyId == trialSiteSurveyId).ToList(); - if (!siteUserList.Any(t => t.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator || t.UserTypeEnum == UserTypeEnum.CRA)) + if (!siteUserList.Any(t => t.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator || t.UserTypeEnum == UserTypeEnum.CRA) && extralConfig.IsOnlyUploadFile == false) { throw new BusinessValidationFailedException(_localizer["TrialSiteSurvey_MissingAccount"]); }