From bab20666afd029e979e99d92815ebd05612c836b Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Mon, 15 Sep 2025 15:51:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=BD=E6=9F=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Common/AuditingData.cs                    | 54 +++++++++++++------
 1 file changed, 38 insertions(+), 16 deletions(-)

diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index 730bb7f96..d5b43b808 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
@@ -1,4 +1,5 @@
-using IRaCIS.Core.Domain.Models;
+using Hangfire.Storage.Monitoring;
+using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infrastructure;
 using IRaCIS.Core.Infrastructure.Extention;
@@ -2906,6 +2907,40 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                         var visitTaskId = taskList.OrderByDescending(x => x.VisitTaskNum).FirstOrDefault()?.Id;
 
+                        var objList = new List<object>();
+
+                      
+
+
+
+                        var questionAnswerList = taskQuestionAnswerList.Join(quesionList,
+                            t => t.ReadingQuestionTrialId,
+                            u => u.QuestionId,
+                            (t, u) =>
+                            new
+                            {
+                                TaskName = taskList.FirstOrDefault(k => k.Id == t.VisitTaskId)?.TaskName,
+                                VisitTaskNum = taskList.FirstOrDefault(k => k.Id == t.VisitTaskId)?.VisitTaskNum,
+                                Answer = Translationunit(u.AnswerType, u.Unit, u.CustomUnit, unitDataList, t.Answer),
+                                u.DictionaryCode,
+                                u.QuestionName,
+                                u.QuestionEnName,
+                                t.VisitTaskId,
+                                u.ShowOrder,
+                            }).OrderBy(t => t.VisitTaskNum).ThenBy(t => t.ShowOrder).ToList();
+
+                        foreach (var item in taskList.OrderBy(x => x.VisitTaskNum))
+                        {
+                            var obj = new
+                            {
+                                TaskBlindName = item.TaskBlindName,
+                                VisitQuestionAnswerList = questionAnswerList.Where(y=>y.VisitTaskId==item.Id).ToList(),
+                            };
+                            objList.Add(obj);
+                        }
+
+
+
                         await InsertInspection<ReadingTaskQuestionAnswer>(cloneEntity, type, x => new InspectionConvertDTO()
                         {
                             VisitTaskId = visitTaskId,
@@ -2918,21 +2953,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                         }, new
                         {
-                            QuestionAnswerList = taskQuestionAnswerList.Join(quesionList,
-                            t => t.ReadingQuestionTrialId,
-                            u => u.QuestionId,
-                            (t, u) =>
-                            new
-                            {
-                                TaskName = taskList.FirstOrDefault(k=>k.Id==t.VisitTaskId)?.TaskName,
-                                VisitTaskNum =    taskList.FirstOrDefault(k => k.Id == t.VisitTaskId)?.VisitTaskNum,
-                                Answer = Translationunit(u.AnswerType, u.Unit, u.CustomUnit, unitDataList, t.Answer),
-                                u.DictionaryCode,
-                                u.QuestionName,
-                                u.QuestionEnName,
-                                u.ShowOrder
-                            }).OrderBy(t => t.VisitTaskNum).ThenBy(t => t.ShowOrder).ToList()
-                         ,
+                            GlobalAnswerList = objList,
+                            QuestionAnswerList = questionAnswerList,
                             TableQuestionAndAnswerList = tableQuesionAndAnswerList
                         }
                              );