XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_IRC_Net10' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net10
continuous-integration/drone/push Build is running Details

Uat_IRC_Net10
he 2026-07-03 11:05:23 +08:00
parent 9bfdb2f06a d6436b01d4
commit d62d7172d0
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
View File

@ -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 });
} }

4
IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
View File

@ -127,9 +127,9 @@ namespace IRaCIS.Core.Application.Service.Inspection
join trialSign in _trialSignRepository.Where().IgnoreQueryFilters() on data.SignId equals trialSign.Id into trialSigntemp join trialSign in _trialSignRepository.Where().IgnoreQueryFilters() on data.SignId equals trialSign.Id into trialSigntemp
from lefttrialSign in trialSigntemp.DefaultIfEmpty() from lefttrialSign in trialSigntemp.DefaultIfEmpty()
join leftfrontAuditConfig in _frontAuditConfigRepository.Where().Where(x => x.ConfigType == "M" && x.Identification != null && x.IsEnable == true) on join leftfrontAuditConfig in _frontAuditConfigRepository.Where().Where(x => x.ConfigType == "M" && x.Identification != null && x.IsEnable == true) on
data.Identification.ToLower() data.Identification
equals equals
leftfrontAuditConfig.Identification.ToLower() leftfrontAuditConfig.Identification
join moduleTypec in _dictionaryRepository.Where() on new { ModuleType = leftfrontAuditConfig.ModuleTypeId!.Value } equals new { ModuleType = moduleTypec.Id } into moduleTypectemp join moduleTypec in _dictionaryRepository.Where() on new { ModuleType = leftfrontAuditConfig.ModuleTypeId!.Value } equals new { ModuleType = moduleTypec.Id } into moduleTypectemp
from leftmoduleTypec in moduleTypectemp.DefaultIfEmpty() from leftmoduleTypec in moduleTypectemp.DefaultIfEmpty()
join OptTypec in _dictionaryRepository.Where() on new { ModuleType = leftfrontAuditConfig.OptTypeId!.Value } equals new { ModuleType = OptTypec.Id } into optTypetemp join OptTypec in _dictionaryRepository.Where() on new { ModuleType = leftfrontAuditConfig.OptTypeId!.Value } equals new { ModuleType = OptTypec.Id } into optTypetemp

8
IRaCIS.Core.Application/Service/Management/UserService.cs
View File

@ -263,6 +263,8 @@ namespace IRaCIS.Core.Application.Service
IsFirstAdd = false, IsFirstAdd = false,
IsNeedResetPwd = false,
EmailToken = String.Empty EmailToken = String.Empty
}, true); }, true);
@ -449,9 +451,9 @@ namespace IRaCIS.Core.Application.Service
catch (Exception) catch (Exception)
{ {
} }
var find = await _identityUserRepository.FindAsync(identityUserId); var find = await _identityUserRepository.FindAsync(identityUserId);
@ -1279,7 +1281,7 @@ namespace IRaCIS.Core.Application.Service
PermissionStr = t.UserTypeRole.PermissionStr, PermissionStr = t.UserTypeRole.PermissionStr,
UserName = t.IdentityUser.UserName, UserName = t.IdentityUser.UserName,
UserTypeShortName = t.UserTypeRole.UserTypeShortName, UserTypeShortName = t.UserTypeRole.UserTypeShortName,
UserWorkLanguage=t.IdentityUser.UserWorkLanguage UserWorkLanguage = t.IdentityUser.UserWorkLanguage
}).FirstOrDefaultAsync(); }).FirstOrDefaultAsync();
await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = userTokenInfo.IdentityUserId, ActionUserName = $"{userTokenInfo.UserName}", ActionUserType = userTokenInfo.UserTypeShortName, OptType = UserOptType.LoginSelectRole }, true); await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = userTokenInfo.IdentityUserId, ActionUserName = $"{userTokenInfo.UserName}", ActionUserType = userTokenInfo.UserTypeShortName, OptType = UserOptType.LoginSelectRole }, true);

5
IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
View File

@ -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<TrialExtraConfig>(config);
var siteUserList = await _trialSiteUserSurveyRepository.Where(t => t.TrialSiteSurveyId == trialSiteSurveyId) var siteUserList = await _trialSiteUserSurveyRepository.Where(t => t.TrialSiteSurveyId == trialSiteSurveyId)
.Where(t => !(t.IsHistoryUser && t.IsHistoryUserDeleted == true)) .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(); //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"]); throw new BusinessValidationFailedException(_localizer["TrialSiteSurvey_MissingAccount"]);
} }