XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

稽查修改
continuous-integration/drone/push Build is passing Details

Test_HIR_Net8
he 2025-09-15 13:14:00 +08:00
parent 334e51d9fd
commit 6b97d1ce68
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -2814,7 +2814,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|| _userInfo.RequestUrl.Contains("SaveTaskQuestion") || _userInfo.RequestUrl.Contains("SaveTaskQuestion")
|| _userInfo.RequestUrl == "ReadingImageTask/saveVisitTaskQuestions" || _userInfo.RequestUrl == "ReadingImageTask/saveVisitTaskQuestions"
|| _userInfo.RequestUrl == "ReadingImageTask/changeCalculationAnswer" || _userInfo.RequestUrl == "ReadingImageTask/changeCalculationAnswer"
|| _userInfo.RequestUrl == "ReadingImageTask/submitTaskAdditionalQuestion") || _userInfo.RequestUrl == "ReadingImageTask/submitTaskAdditionalQuestion"
|| _userInfo.RequestUrl == "ReadingImageTask/changeReportAnswer")
{ {
var type = AuditOpt.Add; 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 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 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) => (t, u) =>
new 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), Answer = Translationunit(u.AnswerType, u.Unit, u.CustomUnit, unitDataList, t.Answer),
u.DictionaryCode, u.DictionaryCode,
u.QuestionName, u.QuestionName,
u.QuestionEnName, u.QuestionEnName,
u.ShowOrder u.ShowOrder
}).OrderBy(t => t.ShowOrder).ToList() }).OrderBy(t => t.VisitTaskNum).ThenBy(t => t.ShowOrder).ToList()
, ,
TableQuestionAndAnswerList = tableQuesionAndAnswerList TableQuestionAndAnswerList = tableQuesionAndAnswerList
} }