diff --git a/IRaCIS.Core.API/Properties/launchSettings.json b/IRaCIS.Core.API/Properties/launchSettings.json
index 343a2a304..02befd632 100644
--- a/IRaCIS.Core.API/Properties/launchSettings.json
+++ b/IRaCIS.Core.API/Properties/launchSettings.json
@@ -15,7 +15,7 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Uat_Study"
       },
-      "applicationUrl": "http://localhost:6100"
+      "applicationUrl": "http://localhost:6101"
     }
   }
 }
\ No newline at end of file
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
index 15f9dc136..641dc717a 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
@@ -1712,14 +1712,24 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             else
             {
                 var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).ProjectTo<VisitTaskDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
-                var lastTaskId = 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.ArmEnum == taskinfo.ArmEnum
-                     && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect
-                     ).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
+
+                var lastTaskId = default(Guid);
+                if (taskinfo.ReadingTaskState == ReadingTaskState.HaveSigned)
+                {
+                    lastTaskId = await _visitTaskRepository.Where(x => taskinfo.RelatedVisitTaskIdList.Contains(x.Id) && x.Id != taskinfo.Id).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync(); ;
+                }
+                else
+                {
+                     lastTaskId = 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.ArmEnum == taskinfo.ArmEnum
+                       && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect
+                       ).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
+                }
+                 
                 lastVisitTaskId = lastTaskId;
                 return lastTaskId;
             }
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
index 27709adc0..18ca3118c 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
@@ -1373,21 +1373,26 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         /// <returns></returns>
         private async Task<Guid> GetLastVisitTaskId(ReadingCalculateDto inDto)
         {
-            // 拿到这一个访视
-            var thisNum = await _subjectVisitRepository.Where(x => x.Id == inDto.SubjectVisitId).Select(x => x.VisitNum).FirstOrDefaultAsync();
+            var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).ProjectTo<VisitTaskDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
 
-            // 先找到上一个访视
-            var lastVisitId = await _subjectVisitRepository.Where(x => x.SubjectId == inDto.SubjectId && !x.IsLostVisit && x.VisitNum < thisNum).OrderByDescending(x => x.VisitNum).Select(x => x.Id).FirstOrDefaultAsync();
+            var lastTaskId = default(Guid);
+            if (taskinfo.ReadingTaskState == ReadingTaskState.HaveSigned)
+            {
+                lastTaskId = await _visitTaskRepository.Where(x => taskinfo.RelatedVisitTaskIdList.Contains(x.Id) && x.Id != taskinfo.Id).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync(); ;
+            }
+            else
+            {
+                lastTaskId = 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.ArmEnum == taskinfo.ArmEnum
+                  && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect
+                  ).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
+            }
 
-            // 找到访视任务Id
-
-            var LastVisitTaskId = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
-            x.TrialReadingCriterionId == inDto.TrialReadingCriterionId &&
-            x.TaskState == TaskState.Effect &&
-            x.IsAnalysisCreate == inDto.IsAnalysisCreate
-            && x.SourceSubjectVisitId == lastVisitId && x.ArmEnum==inDto.ArmEnum).Select(x => x.Id).FirstOrDefaultAsync();
-
-            return LastVisitTaskId;
+            return lastTaskId;
         }
         #endregion
 
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
index 8447d64eb..f5826d6fb 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
@@ -1368,21 +1368,26 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         /// <returns></returns>
         private async Task<Guid> GetLastVisitTaskId(ReadingCalculateDto inDto)
         {
-            // 拿到这一个访视
-            var thisNum = await _subjectVisitRepository.Where(x => x.Id == inDto.SubjectVisitId).Select(x => x.VisitNum).FirstOrDefaultAsync();
+            var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).ProjectTo<VisitTaskDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
 
-            // 先找到上一个访视
-            var lastVisitId = await _subjectVisitRepository.Where(x => x.SubjectId == inDto.SubjectId && !x.IsLostVisit && x.VisitNum < thisNum).OrderByDescending(x => x.VisitNum).Select(x => x.Id).FirstOrDefaultAsync();
+            var lastTaskId = default(Guid);
+            if (taskinfo.ReadingTaskState == ReadingTaskState.HaveSigned)
+            {
+                lastTaskId = await _visitTaskRepository.Where(x => taskinfo.RelatedVisitTaskIdList.Contains(x.Id) && x.Id != taskinfo.Id).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync(); ;
+            }
+            else
+            {
+                lastTaskId = 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.ArmEnum == taskinfo.ArmEnum
+                  && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect
+                  ).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
+            }
 
-            // 找到访视任务Id
-
-            var LastVisitTaskId = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
-            x.TrialReadingCriterionId == inDto.TrialReadingCriterionId &&
-            x.TaskState == TaskState.Effect &&
-            x.IsAnalysisCreate == inDto.IsAnalysisCreate
-            && x.SourceSubjectVisitId == lastVisitId && x.ArmEnum==inDto.ArmEnum).Select(x => x.Id).FirstOrDefaultAsync();
-
-            return LastVisitTaskId;
+            return lastTaskId;
         }
         #endregion