diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 2fae61170..5dee7d4fe 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -2814,7 +2814,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common || _userInfo.RequestUrl.Contains("SaveTaskQuestion") || _userInfo.RequestUrl == "ReadingImageTask/saveVisitTaskQuestions" || _userInfo.RequestUrl == "ReadingImageTask/changeCalculationAnswer" - || _userInfo.RequestUrl == "ReadingImageTask/submitTaskAdditionalQuestion") + || _userInfo.RequestUrl == "ReadingImageTask/submitTaskAdditionalQuestion" + || _userInfo.RequestUrl == "ReadingImageTask/changeReportAnswer") { var type = AuditOpt.Add; @@ -2829,6 +2830,10 @@ namespace IRaCIS.Core.Infra.EFCore.Common //具体的答案 var taskQuestionAnswerList = entitys.Where(x => x.Entity.GetType() == typeof(ReadingTaskQuestionAnswer)).Select(t => t.Entity as ReadingTaskQuestionAnswer).ToList(); + var taskIds = taskQuestionAnswerList.Select(x => x.VisitTaskId).Distinct().ToList(); + + var taskList=await _dbContext.VisitTask.Where(t => taskIds.Contains(t.Id)).ToListAsync(); + //获取问题名称 组合成数组 var quesionList = await _dbContext.ReadingQuestionTrial.Where(t => taskQuestionAnswerList.Select(k => k.ReadingQuestionTrialId).Contains(t.Id)).IgnoreQueryFilters().Select(t => new { @@ -2917,12 +2922,14 @@ namespace IRaCIS.Core.Infra.EFCore.Common (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.ShowOrder).ToList() + }).OrderBy(t => t.VisitTaskNum).ThenBy(t => t.ShowOrder).ToList() , TableQuestionAndAnswerList = tableQuesionAndAnswerList }