diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs index 99d76da1a..a8fc1b22c 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs @@ -378,10 +378,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate if (needRowIds.Contains(x.Id)) { index++; - x.RowIndex = index; - x.RowMark = otherLesionQuestion.OrderMark + x.RowIndex.GetLesionMark(); var fristAddTaskId = x.FristAddTaskId.Clone(); + x.RowIndex = index; x.FromMark = fristAddTaskId == beforeConvertedTaskId ? string.Empty : x.RowMark; + x.RowMark = otherLesionQuestion.OrderMark + x.RowIndex.GetLesionMark(); + + x.FristAddTaskId = fristAddTaskId == beforeConvertedTaskId ? visitTaskId : fristAddTaskId; x.QuestionId = otherLesionQuestion.Id; x.OrderMark = otherLesionQuestion.OrderMark;