IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs

@@ -3317,15 +3317,14 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 var liverSegmentation = await _dbContext.ReadingTableQuestionAnswer.Where(x => x.RowId == entity.RowId && x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.liverSegmentation).Select(x => x.Answer).FirstOrDefaultAsync();
 
                 var generalId=new Guid();
-                 if (entity.MarkId != null)
-                {
-                    generalId = entity.MarkId.Value;
-                }
-                else if (entity.TableQuestionId == null && entity.QuestionId == null)
+                if (entity.TableQuestionId == null && entity.QuestionId == null)
                 {
                     generalId = entity.Id;
                 }
-
+                else if(entity.MarkId!=null)
+                {
+                    generalId= entity.MarkId.Value;
+                }
                 else
                 {
                     generalId = IdentifierHelper.CreateGuid(entity.VisitTaskId.ToString(), entity.QuestionId.ToString(), entity.RowId.ToString(), entity.TableQuestionId.ToString(), "ReadingTaskQuestionMark");