From adf82e862dd90034ac9e000237a233db8289bded Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Wed, 31 Dec 2025 14:52:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Common/AuditingData.cs                    | 68 +++++++++++++------
 1 file changed, 48 insertions(+), 20 deletions(-)

diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index e1975b1dd..c735d76fa 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
@@ -3644,22 +3644,53 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 var entity = item.Entity as ReadingNoneDicomMarkBinding;
                 var selfDefineIdentification = string.Empty;
-                switch (type)
+
+                var answer = string.Empty;
+                Guid? questionId=Guid.Empty;
+                string tableQuestionName = string.Empty;
+                var rowMark= string.Empty;
+                if (entity.TableQuestionId == null)
                 {
-                    case "Add":
-                        selfDefineIdentification = "SaveTaskQuestion/-10/ReadingTaskQuestionAnswer/Add/AddMark";
-                        break;
-                    case "Update":
-                        selfDefineIdentification = "SaveTaskQuestion/-10/ReadingTaskQuestionAnswer/Add/UpdateMark";
-                        break;
-                    case "Deleted":
-                        selfDefineIdentification = "SaveTaskQuestion/-10/ReadingTaskQuestionAnswer/Add/DeleteMark";
-                        break;
+                    switch (type)
+                    {
+                        case "Add":
+                            selfDefineIdentification = "SaveTaskQuestion/-10/ReadingTaskQuestionAnswer/Add/AddMark";
+                            break;
+                        case "Update":
+                            selfDefineIdentification = "SaveTaskQuestion/-10/ReadingTaskQuestionAnswer/Add/UpdateMark";
+                            break;
+                        case "Deleted":
+                            selfDefineIdentification = "SaveTaskQuestion/-10/ReadingTaskQuestionAnswer/Add/DeleteMark";
+                            break;
+                    }
+
+                    questionId = entity.QuestionId;
+                    answer = entitys.Where(x => x.Entity.GetType() == typeof(ReadingTaskQuestionAnswer)).Select(x => x.Entity as ReadingTaskQuestionAnswer).Select(x => x.Answer).FirstOrDefault();
+                }
+                else
+                {
+                    switch (type)
+                    {
+                        case "Add":
+                            selfDefineIdentification = "saveTableQuestionMark/-10/ReadingTableQuestionAnswer/Add/AddMark";
+                            break;
+                        case "Update":
+                            selfDefineIdentification = "saveTableQuestionMark/-10/ReadingTableQuestionAnswer/Add/UpdateMark";
+                            break;
+                        case "Deleted":
+                            selfDefineIdentification = "saveTableQuestionMark/-10/ReadingTableQuestionAnswer/Add/DeleteMark";
+                            break;
+                    }
+                    questionId = entity.QuestionId;
+                    tableQuestionName= _dbContext.ReadingTableQuestionTrial.Where(x => x.Id == entity.TableQuestionId).Select(x => _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName).FirstOrDefault();
+                    answer = entitys.Where(x => x.Entity.GetType() == typeof(ReadingTableQuestionAnswer)).Select(x => x.Entity as ReadingTableQuestionAnswer).Select(x => x.Answer).FirstOrDefault();
+                    rowMark= _dbContext.ReadingTableAnswerRowInfo.Where(x => x.Id == entity.RowId).Select(x => x.RowMark).FirstOrDefault();
                 }
 
-                var answer = entitys.Where(x => x.Entity.GetType() == typeof(ReadingTaskQuestionAnswer)).FirstOrDefault();
 
-                var mark= entitys.Where(x => x.Entity.GetType() == typeof(ReadingNoneDicomMark)).Select(x=>x.Entity as ReadingNoneDicomMark).FirstOrDefault();
+
+
+                    var mark = entitys.Where(x => x.Entity.GetType() == typeof(ReadingNoneDicomMark)).Select(x => x.Entity as ReadingNoneDicomMark).FirstOrDefault();
                 if (mark == null)
                 {
                     mark = await _dbContext.ReadingNoneDicomMark.Where(x => x.Id == entity.NoneDicomMarkId).FirstOrDefaultAsync();
@@ -3668,13 +3699,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 var QuestionName = string.Empty;
                 if (answer != null)
                 {
-                    QuestionName= _dbContext.ReadingQuestionTrial.Where(x => x.Id == (answer.Entity as ReadingTaskQuestionAnswer).ReadingQuestionTrialId).Select(x => _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName).FirstOrDefault();
+                    QuestionName= _dbContext.ReadingQuestionTrial.Where(x => x.Id == questionId).Select(x => _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName).FirstOrDefault();
                 }
-                //var selfDefineIdentification = "ReadingImageTask/submitCustomTag/ReadingTaskQuestionMark/";
-                //if (type == "Deleted")
-                //{
-                //    selfDefineIdentification = "ReadingImageTask/deleteCustomTag/ReadingTaskQuestionMark/";
-                //}
 
                 await InsertInspection<ReadingNoneDicomMarkBinding>(entity, type, x => new InspectionConvertDTO()
                 {
@@ -3682,10 +3708,12 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 }, new
                 {
-                    MarkName= mark==null|| type== "Deleted" ? string.Empty: mark.OrderMarkName,
+                    RowMark= rowMark,
+                    TableQuestionName = tableQuestionName,
+                    MarkName = mark==null|| type== "Deleted" ? string.Empty: mark.OrderMarkName,
                     PicturePath= mark == null ? string.Empty : mark.PicturePath,
                     QuestionName = QuestionName,
-                    QuestinonAnswer= answer==null?string.Empty:(answer.Entity as ReadingTaskQuestionAnswer).Answer
+                    QuestinonAnswer= answer
                 });
             }