diff --git a/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs b/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs index 8baf7789d..c79bf6a2e 100644 --- a/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs +++ b/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs @@ -300,6 +300,17 @@ public static class ExcelExportHelper { public Guid Id { get; set; } public string Name { get; set; } + + public override bool Equals(object obj) + { + if (obj is not ColumItem other) return false; + return Id == other.Id && Name == other.Name; + } + + public override int GetHashCode() + { + return HashCode.Combine(Id, Name); + } } public List ColumnIdList => ColumnIdNameList == null ? new List() : ColumnIdNameList.Select(t => t.Id.ToString()).ToList(); diff --git a/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs index 76722ca91..5e05110c0 100644 --- a/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs +++ b/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs @@ -121,7 +121,9 @@ namespace IRaCIS.Core.Application.ViewModel public class InternationalizationSimpleDto : BatchInternationalizationDto { + public string Version { get; set; } + public DateTime CreateTime { get; set; } } public class BatchUpdateInfoCommand diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index ccbf5e4d1..51c7e4496 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -2400,7 +2400,7 @@ namespace IRaCIS.Core.Application.Service.Common { Id = Guid.Empty, Name = (t.QuestionType == QuestionType.ExistDisease || t.QuestionType == QuestionType.Tumor) ? (_userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估") : t.QuestionName - }).ToList(); + }).Distinct().ToList(); @@ -2413,7 +2413,7 @@ namespace IRaCIS.Core.Application.Service.Common { Id = Guid.Empty, Name = (t.QuestionType == QuestionType.ExistDisease || t.QuestionType == QuestionType.ImgOncology) ? (_userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估") : t.QuestionName - }).ToList(); + }).Distinct().ToList(); } else if (criterion.CriterionType == CriterionType.PCWG3) @@ -2422,7 +2422,7 @@ namespace IRaCIS.Core.Application.Service.Common { Id = Guid.Empty, Name = t.QuestionName - }).ToList(); + }).Distinct().ToList(); } diff --git a/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs b/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs index 809aa0dd0..77897fce0 100644 --- a/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs +++ b/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs @@ -45,6 +45,10 @@ namespace IRaCIS.Core.Application.Service ValueCN = t.ValueCN, FrontType = t.FrontType, Description = t.Description, + Module=t.Module, + State = t.State, + Version=t.PublishLog.Version, + CreateTime = t.CreateTime, }).ToListAsync(); await _fusionCache.SetAsync>(CacheKeys.FrontInternational, list, TimeSpan.FromDays(1)); diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs index 4b67901d9..002c488ad 100644 --- a/IRaCIS.Core.Application/Service/Management/UserService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserService.cs @@ -810,7 +810,7 @@ namespace IRaCIS.Core.Application.Service { //删除验证码历史记录 await _verificationCodeRepository.BatchDeleteNoTrackingAsync(t => t.Id == verificationRecord.Id); - await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionUserName = _userInfo.UserName, TargetIdentityUserId = identityUserId, OptType = UserOptType.MFALogin }, true); + await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionUserName = _userInfo.UserName, ActionIdentityUserId = identityUserId, OptType = UserOptType.MFALogin }, true); } } diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index c0be892de..98c5c7fd2 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -264,7 +264,7 @@ namespace IRaCIS.Core.Application.Image.QA sv.CheckChallengeState = CheckChanllengeTypeEnum.CRCWaitPMReply; } - else if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt != (int)UserTypeEnum.APM) + else if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.APM) { sv.CheckChallengeState = CheckChanllengeTypeEnum.PMWaitCRCReply; }