diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index e79ff00a1..0b8d9e488 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -704,14 +704,6 @@ namespace IRaCIS.Application.Services
         {
             //await AddDefaultValueToTask(inDto.VisitTaskId);
             var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
-            if (taskInfo.ReadingTaskState == ReadingTaskState.WaitReading)
-            {
-				await _visitTaskRepository.UpdatePartialFromQueryAsync(inDto.VisitTaskId, x => new VisitTask()
-				{
-					ReadingTaskState = ReadingTaskState.Reading,
-
-				});
-			}
             var result = await GetReadingQuestion(taskInfo.TrialReadingCriterionId, taskInfo.Id, inDto.QuestionClassify,inDto.GroupClassifyList);
 
             return (result, new
@@ -832,10 +824,7 @@ namespace IRaCIS.Application.Services
         [HttpGet]
         public async Task<List<GetTableAnswerRowInfoOutDto>> GetTableAnswerRowInfoList(GetTableAnswerRowInfoInDto inDto)
         {
-            await _readingCalculateService.AddTaskLesionAnswerFromLastTask(new AddTaskLesionAnswerFromLastTaskInDto()
-            {
-                VisitTaskId = inDto.VisitTaskId
-            });
+
             var result = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId)
                 .WhereIf(inDto.QuestionId != null, x => x.QuestionId == inDto.QuestionId)
                 .ProjectTo<GetTableAnswerRowInfoOutDto>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex)
@@ -2460,6 +2449,15 @@ namespace IRaCIS.Application.Services
                 task.IsNeedReadClinicalData = clinicalDataList.Where(x => x.ClinicalDataLevel != ClinicalLevel.Subject).Count() > 0;
             }
 
+            if (visitTaskInfo.ReadingTaskState == ReadingTaskState.WaitReading)
+            {
+				await _readingCalculateService.AddTaskLesionAnswerFromLastTask(new AddTaskLesionAnswerFromLastTaskInDto()
+				{
+					VisitTaskId = task.VisitTaskId
+				});
+			}
+
+
             // 如果已经签名 就不需要再读了
             task.IsNeedReadClinicalData = visitTaskInfo.ReadingTaskState == ReadingTaskState.HaveSigned ? false : task.IsNeedReadClinicalData;
             task.DigitPlaces = criterionInfo.DigitPlaces;
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs
index 4328fa62a..c069570fb 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs
@@ -55,11 +55,6 @@ namespace IRaCIS.Application.Services
                 TrialId = inDto.TrialId
             }).ToList();
 
-            await _visitTaskRepository.UpdatePartialFromQueryAsync(inDto.VisitTaskId, x => new VisitTask()
-            {
-                ReadingTaskState = ReadingTaskState.Reading,
-
-            });
             await _readingTaskQuestionAnswerRepository.AddRangeAsync(readingTaskAnswerList);
             var result = await _visitTaskRepository.SaveChangesAsync();
             return ResponseOutput.Ok(result);
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
index 70bb92f7e..7db32b19c 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
@@ -191,7 +191,6 @@ namespace IRaCIS.Application.Services
 
             await _readingOncologyTaskInfoRepository.AddRangeAsync(readingOncologies);
 
-            await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.Id == inDto.OncologyTaskId, u => new VisitTask() { ReadingTaskState = ReadingTaskState.Reading });
 
             var result = await _readingOncologyTaskInfoRepository.SaveChangesAsync();
 
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
index 87f372509..dd2c36627 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
@@ -133,12 +133,16 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                 if (readingTaskState == ReadingTaskState.WaitReading)
                 {
-                    result = await service.AddTaskLesionAnswerFromLastTask(inDto);
-                    await service.CalculateTask(new CalculateTaskInDto()
+                    if (visitTaskInfo.ReadingCategory == ReadingCategory.Visit)
                     {
-                        IsChangeOtherTask = false,
-                        VisitTaskId = inDto.VisitTaskId,
-                    });
+						result = await service.AddTaskLesionAnswerFromLastTask(inDto);
+						await service.CalculateTask(new CalculateTaskInDto()
+						{
+							IsChangeOtherTask = false,
+							VisitTaskId = inDto.VisitTaskId,
+						});
+					}
+                   
 
                     await _visitTaskRepository.UpdatePartialFromQueryAsync(inDto.VisitTaskId, x => new VisitTask()
                     {