diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 54a51c7f9..138f7bcbd 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -428,7 +428,8 @@ namespace IRaCIS.Core.Application.Service
             };
 
             return await _trialDocumentRepository.Where(x => x.TrialId == inDto.TrialId
-            && x.TrialDocConfirmedUserList.Any(y => y.ConfirmUserId == _userInfo.UserRoleId && y.ConfirmTime != null)
+            && 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")
             .WhereIf(userType == UserTypeEnum.IQC, t => t.FileType.Code == "4" || t.FileType.Code == "5")
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<Guid> isChooseVisitIds = new List<Guid>();
             List<Guid> IsGenerateVisitIds = new List<Guid>();
             List<ReadingPeriodPlan> chooseVisitVisitList = new List<ReadingPeriodPlan>();
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<VisitStudyTime> visitStudies = await _dicomStudyRepository.Where(x => visitIds.Contains(x.SubjectVisitId) && x.ModalityForEdit == "BoneScan").Select(x => new VisitStudyTime()
+                List<VisitStudyTime> 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