diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs index 8a18fe606..a8fc1b22c 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs @@ -299,6 +299,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate tableRowAnswers.ForEach(x => { + x.ReportMark = x.RowMark; x.VisitTaskId = visitTaskId; x.IsCurrentTaskAdd = false; x.FristAddTaskId = x.FristAddTaskId == beforeConvertedTaskId ? visitTaskId : x.FristAddTaskId; @@ -377,14 +378,16 @@ 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; - x.ReportMark = x.RowMark; + }