diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
index b57a309bb..501726155 100644
--- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
@@ -127,7 +127,8 @@ namespace IRaCIS.Core.Application.Service
                             && x.ReadingCategory == ReadingCategory.Visit
                             && x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId
 
-                                    && x.DoctorUserId == taskInfo.DoctorUserId &&
+                                    && 
+                                    //x.DoctorUserId == taskInfo.DoctorUserId &&
                                     x.ReadingTaskState == ReadingTaskState.HaveSigned &&
                                     x.ReReadingApplyState != ReReadingApplyState.Agree
                                    ).OrderBy(x => x.VisitTaskNum).Select(x => new TaskInfo()
@@ -155,7 +156,7 @@ namespace IRaCIS.Core.Application.Service
                          && x.ReadingCategory == ReadingCategory.Visit
                         && x.IsAnalysisCreate == taskInfo.IsAnalysisCreate
                         && x.IsSelfAnalysis == taskInfo.IsSelfAnalysis
-                        && x.DoctorUserId != taskInfo.DoctorUserId
+                        && x.ArmEnum != taskInfo.ArmEnum
                         && x.ReadingTaskState == ReadingTaskState.HaveSigned
                         && x.ReReadingApplyState != ReReadingApplyState.Agree)
                             .OrderBy(x => x.VisitTaskNum).Select(x => new TaskInfo()
@@ -204,7 +205,7 @@ namespace IRaCIS.Core.Application.Service
                         List<TaskInfo> otherTask = await _visitTaskRepository.Where(x =>
                         x.SouceReadModuleId == taskInfo.SouceReadModuleId
                         && x.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId
-                        && x.DoctorUserId != taskInfo.DoctorUserId
+                        && x.ArmEnum != taskInfo.ArmEnum
                           && x.IsAnalysisCreate == taskInfo.IsAnalysisCreate
                         && x.IsSelfAnalysis == taskInfo.IsSelfAnalysis
                         && x.ReadingTaskState == ReadingTaskState.HaveSigned
@@ -259,7 +260,7 @@ namespace IRaCIS.Core.Application.Service
                          && (x.ReadingCategory == ReadingCategory.Global || x.ReadingCategory == ReadingCategory.Judge)
                         && x.IsAnalysisCreate == taskInfo.IsAnalysisCreate
                         && x.IsSelfAnalysis == taskInfo.IsSelfAnalysis
-                        && x.DoctorUserId == taskInfo.DoctorUserId
+                        && x.ArmEnum == taskInfo.ArmEnum
                         && x.ReadingTaskState == ReadingTaskState.HaveSigned
                         && x.ReReadingApplyState != ReReadingApplyState.Agree)
                        .Select(x => new
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
index 0c126a36a..1ad571f96 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
@@ -170,7 +170,7 @@ namespace IRaCIS.Core.Application.Service
 
 
             var otherGlobalTask = await _visitTaskRepository.Where(x => x.SouceReadModuleId == taskInfo.SouceReadModuleId && x.IsAnalysisCreate == taskInfo.IsAnalysisCreate
-            && x.IsSelfAnalysis == taskInfo.IsSelfAnalysis && x.TaskState == TaskState.Effect && x.DoctorUserId != taskInfo.DoctorUserId
+            && x.IsSelfAnalysis == taskInfo.IsSelfAnalysis && x.TaskState == TaskState.Effect && x.ArmEnum != taskInfo.ArmEnum
           ).FirstOrDefaultAsync();
             if (otherGlobalTask != null)
             {
@@ -196,7 +196,7 @@ namespace IRaCIS.Core.Application.Service
                            && x.ReadingCategory == ReadingCategory.Judge
                           && x.IsAnalysisCreate == taskInfo.IsAnalysisCreate
                           && x.IsSelfAnalysis == taskInfo.IsSelfAnalysis
-                          && x.DoctorUserId == taskInfo.DoctorUserId
+                          //&& x.DoctorUserId == taskInfo.DoctorUserId
                           && x.ReadingTaskState == ReadingTaskState.HaveSigned
                           && x.VisitTaskNum == taskInfo.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Judge]
                           && x.ReReadingApplyState != ReReadingApplyState.Agree).FirstOrDefaultAsync();
@@ -219,7 +219,7 @@ namespace IRaCIS.Core.Application.Service
                    x.IsAnalysisCreate == taskInfo.IsAnalysisCreate &&
                    x.ArmEnum == taskInfo.ArmEnum &&
                    x.IsSelfAnalysis == taskInfo.IsSelfAnalysis &&
-                   x.DoctorUserId == taskInfo.DoctorUserId &&
+                   x.ArmEnum == taskInfo.ArmEnum &&
                    x.TaskState == TaskState.Effect &&
                    x.VisitTaskNum < taskInfo.VisitTaskNum);
 
@@ -334,7 +334,7 @@ namespace IRaCIS.Core.Application.Service
             var lastGlobalTask = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Global &&
          x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId &&
               x.SubjectId == taskInfo.SubjectId && x.IsAnalysisCreate == taskInfo.IsAnalysisCreate && x.TaskState == TaskState.Effect && x.VisitTaskNum < taskInfo.VisitTaskNum)
-             .Where(x => x.DoctorUserId == taskInfo.DoctorUserId)
+             .Where(x => x.ArmEnum == taskInfo.ArmEnum)
              .OrderByDescending(x => x.VisitTaskNum)
              .FirstOrDefaultAsync();
 
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 0a5e74e85..dfe416260 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -754,7 +754,7 @@ namespace IRaCIS.Core.Application.Service
             if (await _visitTaskRepository.AnyAsync(x => x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId
             && x.IsAnalysisCreate && taskInfo.IsAnalysisCreate
             && x.SubjectId == taskInfo.SubjectId && x.TaskState == TaskState.Effect &&
-            ((x.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed && x.DoctorUserId == taskInfo.DoctorUserId) || x.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed)
+            ((x.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed && x.ArmEnum == taskInfo.ArmEnum) || x.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed)
 
             ))
             {
@@ -843,7 +843,7 @@ namespace IRaCIS.Core.Application.Service
                 var laskTaskId = await _visitTaskRepository.Where(x =>
                                   (x.SubjectId == taskInfo.SubjectId && x.TaskState == TaskState.Effect
                                  && x.IsAnalysisCreate == taskInfo.IsAnalysisCreate
-                                 && x.DoctorUserId == taskInfo.DoctorUserId
+                                 && x.ArmEnum == taskInfo.ArmEnum
                                  && x.IsSelfAnalysis == taskInfo.IsSelfAnalysis
                                  && x.VisitTaskNum < taskInfo.VisitTaskNum
                                  && x.ArmEnum == taskInfo.ArmEnum
@@ -1233,7 +1233,7 @@ namespace IRaCIS.Core.Application.Service
 
                 var baselineTaskId = await _visitTaskRepository.Where(x => x.SourceSubjectVisitId == baseLineVisitId
                   && x.ArmEnum == taskInfo.ArmEnum
-                  && x.DoctorUserId == taskInfo.DoctorUserId
+                  && x.ArmEnum == taskInfo.ArmEnum
                   && x.IsAnalysisCreate == taskInfo.IsAnalysisCreate
                   && x.TaskState == TaskState.Effect
                   && x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId
@@ -1244,7 +1244,7 @@ namespace IRaCIS.Core.Application.Service
                 var laskTaskId = await _visitTaskRepository.Where(x =>
                 (x.SubjectId == taskInfo.SubjectId && x.TaskState == TaskState.Effect
                && x.IsAnalysisCreate == taskInfo.IsAnalysisCreate
-               && x.DoctorUserId == taskInfo.DoctorUserId
+               && x.ArmEnum == taskInfo.ArmEnum
                && x.IsSelfAnalysis == taskInfo.IsSelfAnalysis
                && x.VisitTaskNum < taskInfo.VisitTaskNum
                && x.ArmEnum == taskInfo.ArmEnum
@@ -2130,7 +2130,7 @@ namespace IRaCIS.Core.Application.Service
                         .Where(x => x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
                         x.SubjectId == taskinfo.SubjectId &&
                             x.ReadingCategory == taskinfo.ReadingCategory &&
-                            //x.DoctorUserId == taskinfo.DoctorUserId &&
+                            x.ArmEnum == taskinfo.ArmEnum &&
                             x.ArmEnum == taskinfo.ArmEnum &&
                             x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
                             x.ReadingTaskState == ReadingTaskState.HaveSigned &&
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
index e5c1844e0..74f7bd5b8 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
@@ -160,7 +160,7 @@ namespace IRaCIS.Core.Application.Service
                    x.IsAnalysisCreate == globalOrVisitTaskInfo.IsAnalysisCreate &&
                    x.ArmEnum == globalOrVisitTaskInfo.ArmEnum &&
                    x.IsSelfAnalysis == globalOrVisitTaskInfo.IsSelfAnalysis &&
-                   x.DoctorUserId == globalOrVisitTaskInfo.DoctorUserId &&
+                   x.ArmEnum == globalOrVisitTaskInfo.ArmEnum &&
                    x.TaskState == TaskState.Effect &&
                    x.VisitTaskNum <= globalOrVisitTaskInfo.VisitTaskNum)
                   .OrderBy(x => x.VisitTaskNum).Select(x => new GlobalVisitInfo()
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
index 3b96d8562..bd52df167 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
@@ -438,7 +438,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
               .Where(x => (x.SubjectId == visitTaskInfo.SubjectId
               && (x.TaskState == TaskState.Effect || x.TaskState == TaskState.Freeze)
                && x.IsAnalysisCreate == visitTaskInfo.IsAnalysisCreate
-              && x.DoctorUserId == visitTaskInfo.DoctorUserId
+              && x.ArmEnum == visitTaskInfo.ArmEnum
               && x.IsSelfAnalysis == visitTaskInfo.IsSelfAnalysis
              && x.VisitTaskNum <= visitTaskInfo.VisitTaskNum
               && x.ArmEnum == visitTaskInfo.ArmEnum
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
index 68e484310..04331d07f 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
@@ -1202,7 +1202,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                         var LastVisitTaskId = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
                          x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
                          x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
-                          x.DoctorUserId == taskinfo.DoctorUserId &&
+                          x.ArmEnum == taskinfo.ArmEnum &&
                           x.IsSelfAnalysis == taskinfo.IsSelfAnalysis &&
                          x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ArmEnum == taskinfo.ArmEnum
                          && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect
@@ -1890,7 +1890,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                                                                   x.SourceSubjectVisit.IsBaseLine && x.TaskState == TaskState.Effect &&
                                                                   x.IsAnalysisCreate == inDto.IsAnalysisCreate
-                                                                  && x.DoctorUserId == inDto.DoctorUserId
+                                                                  && x.ArmEnum == inDto.ArmEnum
                                                                   && x.IsSelfAnalysis == inDto.IsSelfAnalysis && x.ArmEnum == inDto.ArmEnum)
                                                                    .Select(x => x.Id).FirstOrDefaultAsync();
 
@@ -1990,7 +1990,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 var lastTaskId = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
                      x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
                      x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
-                      x.DoctorUserId == taskinfo.DoctorUserId &&
+                      x.ArmEnum == taskinfo.ArmEnum &&
                       x.IsSelfAnalysis == taskinfo.IsSelfAnalysis &&
                      x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ArmEnum == taskinfo.ArmEnum
                      && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect
@@ -2020,7 +2020,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 var firstChangeVisitTaskNum = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
                      x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
                      x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
-                      x.DoctorUserId == taskinfo.DoctorUserId &&
+                      x.ArmEnum == taskinfo.ArmEnum &&
                       x.IsSelfAnalysis == taskinfo.IsSelfAnalysis &&
                      x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ArmEnum == taskinfo.ArmEnum
                      && x.BeforeConvertedTaskId != null && x.TaskState == TaskState.Effect
@@ -2030,7 +2030,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 compareTaskList = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
                      x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
                      x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
-                      x.DoctorUserId == taskinfo.DoctorUserId &&
+                      x.ArmEnum == taskinfo.ArmEnum &&
                       x.IsSelfAnalysis == taskinfo.IsSelfAnalysis &&
                      x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ArmEnum == taskinfo.ArmEnum &&
                     x.VisitTaskNum >= firstChangeVisitTaskNum && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
index 8dff69f73..27cfc4ef6 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
@@ -451,7 +451,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             var visitTaskIds = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
                  x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
                  x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
-                  x.DoctorUserId == taskinfo.DoctorUserId &&
+                  x.ArmEnum == taskinfo.ArmEnum &&
                   x.IsSelfAnalysis == taskinfo.IsSelfAnalysis &&
                  x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ArmEnum == taskinfo.ArmEnum
                  && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect
@@ -1282,7 +1282,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     var LastVisitTaskId = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
                     x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
                     x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
-                     x.DoctorUserId == taskinfo.DoctorUserId &&
+                     x.ArmEnum == taskinfo.ArmEnum &&
                      x.IsSelfAnalysis == taskinfo.IsSelfAnalysis &&
                     x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect && x.ArmEnum == taskinfo.ArmEnum
                     ).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
@@ -1913,7 +1913,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                                                                 x.SourceSubjectVisit.IsBaseLine && x.TaskState == TaskState.Effect &&
                                                                 x.IsAnalysisCreate == inDto.IsAnalysisCreate
-                                                                && x.DoctorUserId == inDto.DoctorUserId
+                                                                && x.ArmEnum == inDto.ArmEnum
                                                                 && x.IsSelfAnalysis == inDto.IsSelfAnalysis && x.ArmEnum == inDto.ArmEnum)
                                                                  .Select(x => x.Id).FirstOrDefaultAsync();
             }
@@ -1942,7 +1942,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                                                                   x.SourceSubjectVisit.IsBaseLine && x.TaskState == TaskState.Effect &&
                                                                   x.IsAnalysisCreate == inDto.IsAnalysisCreate
-                                                                  && x.DoctorUserId == inDto.DoctorUserId
+                                                                  && x.ArmEnum == inDto.ArmEnum
                                                                   && x.IsSelfAnalysis == inDto.IsSelfAnalysis && x.ArmEnum == inDto.ArmEnum)
                                                                    .Select(x => x.Id).FirstOrDefaultAsync();
 
@@ -2323,7 +2323,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             var visitTaskIds = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
             x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
             x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
-             x.DoctorUserId == taskinfo.DoctorUserId &&
+             x.ArmEnum == taskinfo.ArmEnum &&
              x.IsSelfAnalysis == taskinfo.IsSelfAnalysis &&
             x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ArmEnum == taskinfo.ArmEnum
             && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect
@@ -3272,7 +3272,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                                                                       && x.TrialReadingCriterionId == inDto.TrialReadingCriterionId &&
                                                                       x.SourceSubjectVisit.IsBaseLine && x.TaskState == TaskState.Effect &&
                                                                       x.IsAnalysisCreate == inDto.IsAnalysisCreate
-                                                                      && x.DoctorUserId == inDto.DoctorUserId
+                                                                      && x.ArmEnum == inDto.ArmEnum
                                                                       && x.IsSelfAnalysis == inDto.IsSelfAnalysis && x.ArmEnum == inDto.ArmEnum)
                                                                        .Select(x => x.Id).FirstOrDefaultAsync();
 
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoWithoutPETCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoWithoutPETCalculateService.cs
index 2bc4c7a52..7e6767b22 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoWithoutPETCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoWithoutPETCalculateService.cs
@@ -450,7 +450,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             var visitTaskIds = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
                  x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
                  x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
-                  x.DoctorUserId == taskinfo.DoctorUserId &&
+                  x.ArmEnum == taskinfo.ArmEnum &&
                   x.IsSelfAnalysis == taskinfo.IsSelfAnalysis &&
                  x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ArmEnum == taskinfo.ArmEnum
                  && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect
@@ -1281,7 +1281,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     var LastVisitTaskId = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
                     x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
                     x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
-                     x.DoctorUserId == taskinfo.DoctorUserId &&
+                     x.ArmEnum == taskinfo.ArmEnum &&
                      x.IsSelfAnalysis == taskinfo.IsSelfAnalysis &&
                     x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect && x.ArmEnum == taskinfo.ArmEnum
                     ).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
@@ -1912,7 +1912,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                                                                 x.SourceSubjectVisit.IsBaseLine && x.TaskState == TaskState.Effect &&
                                                                 x.IsAnalysisCreate == inDto.IsAnalysisCreate
-                                                                && x.DoctorUserId == inDto.DoctorUserId
+                                                                && x.ArmEnum == inDto.ArmEnum
                                                                 && x.IsSelfAnalysis == inDto.IsSelfAnalysis && x.ArmEnum == inDto.ArmEnum)
                                                                  .Select(x => x.Id).FirstOrDefaultAsync();
             }
@@ -1941,7 +1941,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                                                                   x.SourceSubjectVisit.IsBaseLine && x.TaskState == TaskState.Effect &&
                                                                   x.IsAnalysisCreate == inDto.IsAnalysisCreate
-                                                                  && x.DoctorUserId == inDto.DoctorUserId
+                                                                  && x.ArmEnum == inDto.ArmEnum
                                                                   && x.IsSelfAnalysis == inDto.IsSelfAnalysis && x.ArmEnum == inDto.ArmEnum)
                                                                    .Select(x => x.Id).FirstOrDefaultAsync();
 
@@ -2322,7 +2322,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             var visitTaskIds = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
             x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
             x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
-             x.DoctorUserId == taskinfo.DoctorUserId &&
+             x.ArmEnum == taskinfo.ArmEnum &&
              x.IsSelfAnalysis == taskinfo.IsSelfAnalysis &&
             x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ArmEnum == taskinfo.ArmEnum
             && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect
@@ -3271,7 +3271,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                                                                       && x.TrialReadingCriterionId == inDto.TrialReadingCriterionId &&
                                                                       x.SourceSubjectVisit.IsBaseLine && x.TaskState == TaskState.Effect &&
                                                                       x.IsAnalysisCreate == inDto.IsAnalysisCreate
-                                                                      && x.DoctorUserId == inDto.DoctorUserId
+                                                                      && x.ArmEnum == inDto.ArmEnum
                                                                       && x.IsSelfAnalysis == inDto.IsSelfAnalysis && x.ArmEnum == inDto.ArmEnum)
                                                                        .Select(x => x.Id).FirstOrDefaultAsync();
 
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
index 8eed15ecd..4d002e02d 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
@@ -568,7 +568,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     var LastVisitTaskId = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
                     x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
                      x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
-                     x.DoctorUserId == taskinfo.DoctorUserId &&
+                     x.ArmEnum == taskinfo.ArmEnum &&
                         x.IsSelfAnalysis == taskinfo.IsSelfAnalysis &&
                     x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect && x.ArmEnum == taskinfo.ArmEnum
                     ).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
@@ -1167,7 +1167,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
                 siteVisitForTumorList = await _visitTaskRepository.Where(x => (x.ReadingCategory == ReadingCategory.Visit &&
                        x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
-                       x.DoctorUserId == taskinfo.DoctorUserId &&
+                       x.ArmEnum == taskinfo.ArmEnum &&
                        x.IsAnalysisCreate == inDto.IsAnalysisCreate &&
                        x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.VisitTaskNum <= taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect && x.ArmEnum == taskinfo.ArmEnum
                        ) || x.Id == inDto.VisitTaskId).OrderByDescending(x => x.VisitTaskNum).Select(x => new SiteVisitForTumor()
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
index 3b1579c37..fad7dfb76 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
@@ -958,7 +958,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     var LastVisitTaskId = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
                     x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
                     x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
-                     x.DoctorUserId == taskinfo.DoctorUserId &&
+                     x.ArmEnum == taskinfo.ArmEnum &&
                      x.IsSelfAnalysis == taskinfo.IsSelfAnalysis &&
                     x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect && x.ArmEnum == taskinfo.ArmEnum
                     ).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
@@ -1517,7 +1517,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                                                                   x.SourceSubjectVisit.IsBaseLine && x.TaskState == TaskState.Effect &&
                                                                   x.IsAnalysisCreate == inDto.IsAnalysisCreate
-                                                                  && x.DoctorUserId == inDto.DoctorUserId
+                                                                  && x.ArmEnum == inDto.ArmEnum
                                                                   && x.IsSelfAnalysis == inDto.IsSelfAnalysis && x.ArmEnum == inDto.ArmEnum)
                                                                    .Select(x => x.Id).FirstOrDefaultAsync();
 
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
index bd02df1ff..b33a08b02 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
@@ -963,7 +963,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     var LastVisitTaskId = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
                     x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
                     x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
-                     x.DoctorUserId == taskinfo.DoctorUserId &&
+                     x.ArmEnum == taskinfo.ArmEnum &&
                      x.IsSelfAnalysis == taskinfo.IsSelfAnalysis &&
                     x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect && x.ArmEnum == taskinfo.ArmEnum
                     ).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
@@ -1515,7 +1515,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                                                                   x.SourceSubjectVisit.IsBaseLine && x.TaskState == TaskState.Effect &&
                                                                   x.IsAnalysisCreate == inDto.IsAnalysisCreate
-                                                                  && x.DoctorUserId == inDto.DoctorUserId
+                                                                  && x.ArmEnum == inDto.ArmEnum
                                                                   && x.IsSelfAnalysis == inDto.IsSelfAnalysis && x.ArmEnum == inDto.ArmEnum)
                                                                    .Select(x => x.Id).FirstOrDefaultAsync();
 
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs
index 465775d3e..7c986f08e 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs
@@ -379,7 +379,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     var LastVisitTaskId = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
                     x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
                     x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
-                     x.DoctorUserId == taskinfo.DoctorUserId &&
+                     x.ArmEnum == taskinfo.ArmEnum &&
                      x.IsSelfAnalysis == taskinfo.IsSelfAnalysis &&
                     x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect && x.ArmEnum == taskinfo.ArmEnum
                     ).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();