diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
index ffa9241ee..0fe1e81a2 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
@@ -732,14 +732,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 // 判断当前任务是是否有表格问题答案
                 if (!(await _readingTableQuestionAnswerRepository.AnyAsync(x => x.VisitTaskId == visitTaskId)))
                 {
-
                     var LastVisitTaskId = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
-                    x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
-                    x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
-                     x.DoctorUserId == taskinfo.DoctorUserId &&
-                     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();
+                                    x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
+                                    x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
+                                     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();
 
 
 
@@ -823,8 +822,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 x.ReadingTaskState == ReadingTaskState.HaveSigned &&
                 x.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Point1 &&
                 x.SubjectId == taskinfo.SubjectId &&
-                x.SourceSubjectVisitId == taskinfo.SourceSubjectVisitId &&
-                x.DoctorUserId==taskinfo.DoctorUserId).FirstOrDefaultAsync();
+                x.SourceSubjectVisitId == taskinfo.SourceSubjectVisitId 
+                //&&
+                //x.DoctorUserId==taskinfo.DoctorUserId
+                ).FirstOrDefaultAsync();
                 if (recistTask != null)
                 {
                     _userInfo.AuditIdentification = "HCC";
@@ -1622,7 +1623,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                                                                   x.SourceSubjectVisit.IsBaseLine && x.TaskState == TaskState.Effect &&
                                                                   x.IsAnalysisCreate == inDto.IsAnalysisCreate
-                                                                  && x.DoctorUserId == inDto.DoctorUserId
+                                                                  //&& x.DoctorUserId == inDto.DoctorUserId
                                                                   && x.IsSelfAnalysis == inDto.IsSelfAnalysis && x.ArmEnum == inDto.ArmEnum)
                                                                    .Select(x => x.Id).FirstOrDefaultAsync();