diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
index 94f8b0ab5..faaf8a8ad 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
@@ -221,7 +221,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             {
                 x.VisitTaskId = visitTaskId;
                 x.IsCurrentTaskAdd = false;
-                //x.FristAddTaskId = visitTaskId;
+                x.FristAddTaskId = x.FristAddTaskId== beforeConvertedTaskId? visitTaskId : x.FristAddTaskId;
                 x.Id = NewId.NextGuid();
             });