From 8f6e2e342a10967f5f57888e1dc52be37465c4ad Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Sat, 8 Feb 2025 15:58:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=82=BF=E7=98=A4=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=A0=87=E5=87=86-Id=E5=8C=B9=E9=85=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=8E=BB=E9=87=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Helper/FileDocProcess/ExcelExportHelper.cs | 11 +++++++++++ .../Service/Common/ExcelExportService.cs | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) 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/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(); } From ab0c256e0b27767bf6bb9aa9c4c1f58a63141b1b Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 10 Feb 2025 09:25:37 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E8=BF=94=E5=9B=9E=E6=9B=B4=E5=A4=9A=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Common/DTO/InternationalizationViewModel.cs | 2 ++ .../Service/Common/InternationalizationService.cs | 4 ++++ 2 files changed, 6 insertions(+) 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/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)); From 585e4cdc1b2c0b66a2bf012d0d5b0414f300e8dd Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 10 Feb 2025 14:54:04 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E6=80=A7=E6=A0=B8=E6=9F=A5=E5=AF=B9=E8=AF=9D=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/QC/QCOperationService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } From 131425774a65d5ce7cde1fc0365475d3ebbc03c9 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 10 Feb 2025 15:08:14 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9MFA=20=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Management/UserService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); } }