From a1657f58278ae7aaf5d7d7c9ad1b7a1194b3b0fb Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Fri, 7 Nov 2025 11:47:57 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReadingPeriod/ReadingPeriodSetService.cs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs index 5e97d1003..468288bbb 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs @@ -696,6 +696,19 @@ namespace IRaCIS.Core.Application.Service SiteIds = inDto.SiteIds, }); + if (await _readingPeriodSetRepository.AnyAsync(x => x.Id != inDto.TrialReadingCriterionId && x.IsTakeEffect != ReadingPeriodStatus.Revocation + && x.TrialId == inDto.TrialId && x.ReadingPeriodName == inDto.ReadingPeriodName && x.TrialReadingCriterionId == inDto.TrialReadingCriterionId)) + { + + throw new BusinessValidationFailedException(_localizer["ReadingPeriodSet_NameDup"]); + + } + if (inDto.ReadingPeriodName == "Global") + { + throw new BusinessValidationFailedException(_localizer["ReadingPeriodSet_Global"]); + + } + List isChooseVisitIds = new List(); List IsGenerateVisitIds = new List(); List chooseVisitVisitList = new List(); From 929903aa1bacf17a9231c02cb939afb788d031d0 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Fri, 7 Nov 2025 13:19:21 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ReadingCalculate/PCWG3CalculateService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs index cf2663ce7..b459ed698 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs @@ -1157,7 +1157,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate var visitIds = siteVisitForTumorList.Select(x => x.SubjectVisitId).ToList(); // Dicom 用NM 非dicom 用骨扫描 (BoneScan) - List visitStudies = await _dicomStudyRepository.Where(x => visitIds.Contains(x.SubjectVisitId) && x.ModalityForEdit == "BoneScan").Select(x => new VisitStudyTime() + List visitStudies = await _dicomStudyRepository.Where(x => visitIds.Contains(x.SubjectVisitId) && x.ModalityForEdit == "Bone Scan").Select(x => new VisitStudyTime() { SubjectVisitId = x.SubjectVisitId, StudyTime = x.StudyTime @@ -1165,7 +1165,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate }).ToListAsync(); visitStudies.AddRange( - await _noneDicomStudyRepository.Where(x => visitIds.Contains(x.SubjectVisitId) && x.Modality == "BoneScan").Select(x => new VisitStudyTime() + await _noneDicomStudyRepository.Where(x => visitIds.Contains(x.SubjectVisitId) && x.Modality == "Bone Scan").Select(x => new VisitStudyTime() { SubjectVisitId = x.SubjectVisitId, StudyTime = x.ImageDate From 840de08e69e831ef03634856266ad8612fb82d6c Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Fri, 7 Nov 2025 13:40:25 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/ReadingImageTask/ReadingImageTaskService.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 54a51c7f9..3e5cb4802 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -428,6 +428,7 @@ namespace IRaCIS.Core.Application.Service }; return await _trialDocumentRepository.Where(x => x.TrialId == inDto.TrialId + && x.IsPublish && x.TrialDocConfirmedUserList.Any(y => y.ConfirmUserId == _userInfo.UserRoleId && y.ConfirmTime != null) && x.NeedConfirmedUserTypeList.Any(y => y.NeedConfirmUserTypeId == _userInfo.UserTypeId)) .WhereIf(userType == UserTypeEnum.IndependentReviewer, t => t.FileType.Code == "2" || t.FileType.Code == "6") From cf42b2e57f942822c359921d5e1fcf56e4b72230 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Fri, 7 Nov 2025 14:20:14 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/ReadingImageTask/ReadingImageTaskService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 3e5cb4802..7ca328a03 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -429,7 +429,7 @@ namespace IRaCIS.Core.Application.Service return await _trialDocumentRepository.Where(x => x.TrialId == inDto.TrialId && x.IsPublish - && x.TrialDocConfirmedUserList.Any(y => y.ConfirmUserId == _userInfo.UserRoleId && y.ConfirmTime != null) + && !x.TrialDocConfirmedUserList.Any(y => y.ConfirmUserId == _userInfo.UserRoleId && y.ConfirmTime != null) && x.NeedConfirmedUserTypeList.Any(y => y.NeedConfirmUserTypeId == _userInfo.UserTypeId)) .WhereIf(userType == UserTypeEnum.IndependentReviewer, t => t.FileType.Code == "2" || t.FileType.Code == "6") .WhereIf(userType == UserTypeEnum.IQC, t => t.FileType.Code == "4" || t.FileType.Code == "5") From 44e7ffaeeba025b742d1ce3accaa2b7827bce899 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Fri, 7 Nov 2025 14:31:29 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/ReadingImageTask/ReadingImageTaskService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 7ca328a03..138f7bcbd 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -429,7 +429,7 @@ namespace IRaCIS.Core.Application.Service return await _trialDocumentRepository.Where(x => x.TrialId == inDto.TrialId && x.IsPublish - && !x.TrialDocConfirmedUserList.Any(y => y.ConfirmUserId == _userInfo.UserRoleId && y.ConfirmTime != null) + //&& x.TrialDocConfirmedUserList.Any(y => y.ConfirmUserId == _userInfo.UserRoleId && y.ConfirmTime != null) && x.NeedConfirmedUserTypeList.Any(y => y.NeedConfirmUserTypeId == _userInfo.UserTypeId)) .WhereIf(userType == UserTypeEnum.IndependentReviewer, t => t.FileType.Code == "2" || t.FileType.Code == "6") .WhereIf(userType == UserTypeEnum.IQC, t => t.FileType.Code == "4" || t.FileType.Code == "5")