diff --git a/IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs b/IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs index 3c98bcf29..a5e59292a 100644 --- a/IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs +++ b/IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs @@ -18,6 +18,12 @@ namespace IRaCIS.Core.Application.Filter private readonly string _trialOpt; + public TrialResourceFilter(IEasyCachingProvider provider, IUserInfo userInfo) + { + _provider = provider; + _userInfo = userInfo; + } + public TrialResourceFilter(IEasyCachingProvider provider, IUserInfo userInfo, string trialOpt) { _provider = provider; diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index c1245cabb..5d9fb241c 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -2305,6 +2305,11 @@ 序号标记 + + + 截图地址 + + QuestionId @@ -2530,9 +2535,9 @@ 任务Id - + - Base64编码 + 截图地址 diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 9411c7372..fb4466a4b 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -609,8 +609,13 @@ namespace IRaCIS.Core.Infra.EFCore.Common var taskQuestionAnswerList = entitys.Where(x => x.Entity.GetType() == typeof(ReadingTaskQuestionAnswer)).Select(t => t.Entity as ReadingTaskQuestionAnswer).ToList(); //获取问题名称 组合成数组 - var quesionList = await _dbContext.ReadingQuestionTrial.Where(t => taskQuestionAnswerList.Select(k => k.ReadingQuestionTrialId).Contains(t.Id)).Select(t => new { t.QuestionName, QuestionId = t.Id, - t.DictionaryCode, t.ShowOrder }).OrderBy(t => t.ShowOrder).ToListAsync(); + var quesionList = await _dbContext.ReadingQuestionTrial.Where(t => taskQuestionAnswerList.Select(k => k.ReadingQuestionTrialId).Contains(t.Id)).Select(t => new + { + t.QuestionName, + QuestionId = t.Id, + t.DictionaryCode, + t.ShowOrder + }).OrderBy(t => t.ShowOrder).ToListAsync(); var firstEntity = taskQuestionAnswerList.First(); @@ -628,7 +633,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common TrialReadingCriterionId = x.ReadingQuestionCriterionTrialId, - }, new { QuestionAnswerList = taskQuestionAnswerList.Join(quesionList, t => t.ReadingQuestionTrialId, u => u.QuestionId, (t, u) => new { t.Answer, u.DictionaryCode, u.QuestionName, u.ShowOrder }).OrderBy(t => t.ShowOrder).ToList() }); + }, new { QuestionAnswerList = taskQuestionAnswerList.Join(quesionList, t => t.ReadingQuestionTrialId, u => u.QuestionId, (t, u) => new { t.Answer, u.DictionaryCode, u.QuestionName, u.ShowOrder }).OrderBy(t => t.ShowOrder).ToList() }); } @@ -648,22 +653,25 @@ namespace IRaCIS.Core.Infra.EFCore.Common var tableQuestionAnswerList = entitys.Where(x => x.Entity.GetType() == typeof(ReadingTableQuestionAnswer)).Select(t => t.Entity as ReadingTableQuestionAnswer).Where(t => t.RowId == entity.Id).ToList(); - //获取问题名称 组合成数组 - var tableQuesionList = await _dbContext.ReadingTableQuestionTrial.Where(t => tableQuestionAnswerList.Select(k => k.TableQuestionId).Contains(t.Id)).Select(t => - new { + //获取表格问题名称 组合成数组 + var tableQuesionList = await _dbContext.ReadingTableQuestionTrial.Where(t => tableQuestionAnswerList.Select(k => k.TableQuestionId).Contains(t.Id)).Select(t => + new + { TrialReadingCriterionId = t.ReadingQuestionTrial.ReadingQuestionCriterionTrialId, //标准Id Type = t.ReadingQuestionTrial.QuestionName, //病灶类型 t.ReadingQuestionTrial.Unit, t.ReadingQuestionTrial.CustomUnit, t.DictionaryCode, - t.QuestionName, - QuestionId = t.Id, - t.ShowOrder }) + t.QuestionName, + QuestionId = t.Id, + t.ShowOrder + }) .OrderBy(t => t.ShowOrder).ToListAsync(); var trialReadingCriterionId = tableQuesionList.FirstOrDefault()?.TrialReadingCriterionId; - + //获取表名称 类型名称(病灶类型) + var tableName = await _dbContext.ReadingQuestionTrial.Where(t => t.Id == entity.QuestionId).Select(t => t.QuestionName).FirstOrDefaultAsync(); await InsertInspection(entity, type, x => new InspectionConvertDTO() { @@ -675,15 +683,18 @@ namespace IRaCIS.Core.Infra.EFCore.Common }, new { + TableName= tableName, QuestionAnswerList = //需要手动添加病灶类型 - tableQuestionAnswerList.Join(tableQuesionList, t => t.TableQuestionId, u => u.QuestionId, (t, u) => - new { - t.Answer /*u.Unit==ValueUnit.Custom? t.Answer+u.CustomUnit:(u.Unit != ValueUnit.None|| u.Unit != null)*/, + tableQuestionAnswerList.Join(tableQuesionList, t => t.TableQuestionId, u => u.QuestionId, (t, u) => + new + { + t.Answer /*u.Unit==ValueUnit.Custom? t.Answer+u.CustomUnit:(u.Unit != ValueUnit.None|| u.Unit != null)*/, u.QuestionName, u.DictionaryCode, - u.ShowOrder } + u.ShowOrder + } ).OrderBy(t => t.ShowOrder).ToList() });