XCKJ
/
EI-Image-Viewer-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

国际化问题名称

Test.EIImageViewer
he 2023-01-03 13:34:18 +08:00
parent b8e21e5265
commit b055365f18
13 changed files with 273 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
View File

@ -119,6 +119,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public ReportLayType ReportLayType { get; set; } = ReportLayType.Group; public ReportLayType ReportLayType { get; set; } = ReportLayType.Group;
/// <summary>
/// 问题英文分组
/// </summary>
public string GroupEnName { get; set; } = string.Empty;
public List<TaskQuestionAnswer> Answer { get; set; } = new List<TaskQuestionAnswer>(); public List<TaskQuestionAnswer> Answer { get; set; } = new List<TaskQuestionAnswer>();
public List<ReadingReportDto> Childrens { get; set; } = new List<ReadingReportDto>(); public List<ReadingReportDto> Childrens { get; set; } = new List<ReadingReportDto>();

2
IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
View File

@ -271,7 +271,7 @@ namespace IRaCIS.Core.Application.Service
DictionaryCode = x.ReadingQuestionTrial.DictionaryCode, DictionaryCode = x.ReadingQuestionTrial.DictionaryCode,
ShowOrder = x.ReadingQuestionTrial.ShowOrder, ShowOrder = x.ReadingQuestionTrial.ShowOrder,
QuestionGenre = x.ReadingQuestionTrial.QuestionGenre, QuestionGenre = x.ReadingQuestionTrial.QuestionGenre,
QuestionName = x.ReadingQuestionTrial.QuestionName QuestionName = x.ReadingQuestionTrial.QuestionName.LanguageName(x.ReadingQuestionTrial.QuestionEnName,_userInfo.IsEn_Us)
}).ToListAsync(); }).ToListAsync();
var globalChangeAnswer = await _readingGlobalTaskInfoRepository.Where(x => taskIds.Contains(x.GlobalTaskId) && x.Answer != string.Empty && x.GlobalAnswerType == GlobalAnswerType.Question && x.GlobalVisitTask.TaskState == TaskState.Effect).ToListAsync(); var globalChangeAnswer = await _readingGlobalTaskInfoRepository.Where(x => taskIds.Contains(x.GlobalTaskId) && x.Answer != string.Empty && x.GlobalAnswerType == GlobalAnswerType.Question && x.GlobalVisitTask.TaskState == TaskState.Effect).ToListAsync();
medicalReviewInfo.TaskList.ForEach(x => medicalReviewInfo.TaskList.ForEach(x =>

420
IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
View File

@ -136,7 +136,7 @@ namespace IRaCIS.Application.Services
.Select(x => new GetCalculateQuestionsOutDto .Select(x => new GetCalculateQuestionsOutDto
(){ (){
QuestionId = x.Id, QuestionId = x.Id,
QuestionName = x.QuestionName QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us)
}).ToListAsync(); }).ToListAsync();
@ -145,7 +145,7 @@ namespace IRaCIS.Application.Services
{ {
QuestionId= x.Id, QuestionId= x.Id,
x.ReadingQuestionId, x.ReadingQuestionId,
x.QuestionName QuestionName=x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us)
}).ToListAsync(); }).ToListAsync();
@ -182,7 +182,7 @@ namespace IRaCIS.Application.Services
() ()
{ {
QuestionId = x.Id, QuestionId = x.Id,
QuestionName = x.QuestionName QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us)
}).ToListAsync(); }).ToListAsync();
@ -451,7 +451,7 @@ namespace IRaCIS.Application.Services
{ {
var query = _readingQuestionTrialRepository.AsQueryable() var query = _readingQuestionTrialRepository.AsQueryable()
.Where(x => x.ReadingQuestionCriterionTrialId == inDto.ReadingQuestionCriterionTrialId) .Where(x => x.ReadingQuestionCriterionTrialId == inDto.ReadingQuestionCriterionTrialId)
.WhereIf(!inDto.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inDto.QuestionName)) .WhereIf(!inDto.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inDto.QuestionName)||x.QuestionEnName.Contains(x.QuestionEnName))
.WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type.Contains(inDto.Type)) .WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type.Contains(inDto.Type))
.Where(x => x.ReadingCriterionPageId == inDto.ReadingCriterionPageId) .Where(x => x.ReadingCriterionPageId == inDto.ReadingCriterionPageId)
.ProjectTo<ReadingQuestionTrialView>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder); .ProjectTo<ReadingQuestionTrialView>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder);
@ -551,7 +551,7 @@ namespace IRaCIS.Application.Services
.Select(x => new CriterionOtherQuestionOutDto() .Select(x => new CriterionOtherQuestionOutDto()
{ {
QuestionId = x.Id, QuestionId = x.Id,
QuestionName = x.QuestionName, QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
TypeValue = x.TypeValue, TypeValue = x.TypeValue,
GroupName = x.GroupName, GroupName = x.GroupName,
}).ToListAsync(); }).ToListAsync();
@ -586,7 +586,7 @@ namespace IRaCIS.Application.Services
{ {
var result = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.CriterionId && x.Type == ReadingQestionType.Group) var result = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.CriterionId && x.Type == ReadingQestionType.Group)
.Where(x => x.ReadingCriterionPageId == inDto.ReadingCriterionPageId).OrderBy(t => t.ShowOrder) .Where(x => x.ReadingCriterionPageId == inDto.ReadingCriterionPageId).OrderBy(t => t.ShowOrder)
.Select(x => x.GroupName).ToListAsync(); .Select(x =>x.GroupName).ToListAsync();
return result; return result;
@ -634,7 +634,7 @@ namespace IRaCIS.Application.Services
.Select(x => new CriterionOtherQuestionOutDto() .Select(x => new CriterionOtherQuestionOutDto()
{ {
QuestionId = x.Id, QuestionId = x.Id,
QuestionName = x.QuestionName, QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
TypeValue = x.TypeValue, TypeValue = x.TypeValue,
}).ToListAsync(); }).ToListAsync();
@ -962,147 +962,147 @@ namespace IRaCIS.Application.Services
} }
/// <summary> ///// <summary>
/// 更改项目标准（老） ///// 更改项目标准（老）
/// </summary> ///// </summary>
/// <param name="systemCriterionId"></param> ///// <param name="systemCriterionId"></param>
/// <returns></returns> ///// <returns></returns>
private async Task UpdateTrialCriterion(Guid systemCriterionId) //private async Task UpdateTrialCriterion(Guid systemCriterionId)
{ //{
await _readingQuestionCriterionTrialRepository.BatchUpdateNoTrackingAsync(x => x.ReadingQuestionCriterionSystemId == systemCriterionId, x => new ReadingQuestionCriterionTrial() // await _readingQuestionCriterionTrialRepository.BatchUpdateNoTrackingAsync(x => x.ReadingQuestionCriterionSystemId == systemCriterionId, x => new ReadingQuestionCriterionTrial()
{ // {
IsCompleteConfig = true, // IsCompleteConfig = true,
}); // });
var systemCriterionQuestionList = await _readingQuestionSystemRepository.Where(x => x.ReadingQuestionCriterionSystemId == systemCriterionId).ToListAsync(); // var systemCriterionQuestionList = await _readingQuestionSystemRepository.Where(x => x.ReadingQuestionCriterionSystemId == systemCriterionId).ToListAsync();
var trialCriterionList = await _readingQuestionCriterionTrialRepository.Where(x => x.ReadingQuestionCriterionSystemId == systemCriterionId).Select(x => new // var trialCriterionList = await _readingQuestionCriterionTrialRepository.Where(x => x.ReadingQuestionCriterionSystemId == systemCriterionId).Select(x => new
{ // {
x.Id, // x.Id,
x.TrialId, // x.TrialId,
}).ToListAsync(); // }).ToListAsync();
var trialCriterionIdList = trialCriterionList.Select(x => x.Id).ToList(); // var trialCriterionIdList = trialCriterionList.Select(x => x.Id).ToList();
List<ReadingQuestionTrial> needAddQuestionList = new List<ReadingQuestionTrial>(); // List<ReadingQuestionTrial> needAddQuestionList = new List<ReadingQuestionTrial>();
foreach (var item in trialCriterionList) // foreach (var item in trialCriterionList)
{ // {
await _readingQuestionTrialRepository.BatchDeleteNoTrackingAsync(x => trialCriterionIdList.Contains(x.ReadingQuestionCriterionTrialId)); // await _readingQuestionTrialRepository.BatchDeleteNoTrackingAsync(x => trialCriterionIdList.Contains(x.ReadingQuestionCriterionTrialId));
List<ReadingQuestionTrial> trialQuestionList = new List<ReadingQuestionTrial>(); // List<ReadingQuestionTrial> trialQuestionList = new List<ReadingQuestionTrial>();
SetChildParentQuestion(item.Id, item.TrialId, systemCriterionQuestionList, trialQuestionList); // SetChildParentQuestion(item.Id, item.TrialId, systemCriterionQuestionList, trialQuestionList);
needAddQuestionList.AddRange(trialQuestionList); // needAddQuestionList.AddRange(trialQuestionList);
} // }
await _readingQuestionTrialRepository.AddRangeAsync(needAddQuestionList); // await _readingQuestionTrialRepository.AddRangeAsync(needAddQuestionList);
} //}
/// <summary> ///// <summary>
/// 更改项目标准（新） ///// 更改项目标准（新）
/// </summary> ///// </summary>
/// <param name="systemCriterionId"></param> ///// <param name="systemCriterionId"></param>
/// <returns></returns> ///// <returns></returns>
private async Task SynchronizeSystemCriterion(Guid systemCriterionId) //private async Task SynchronizeSystemCriterion(Guid systemCriterionId)
{ //{
var systemCriterion = await _readingQuestionCriterionSystemRepository.FirstOrDefaultAsync(x => x.Id == systemCriterionId); // var systemCriterion = await _readingQuestionCriterionSystemRepository.FirstOrDefaultAsync(x => x.Id == systemCriterionId);
var trialCriterionList = await _readingQuestionCriterionTrialRepository.Where(x => x.ReadingQuestionCriterionSystemId == systemCriterionId).Select(x => new // var trialCriterionList = await _readingQuestionCriterionTrialRepository.Where(x => x.ReadingQuestionCriterionSystemId == systemCriterionId).Select(x => new
{ // {
x.Id, // x.Id,
x.TrialId, // x.TrialId,
}).ToListAsync(); // }).ToListAsync();
var trialCriterionIds = trialCriterionList.Select(x => x.Id).ToList(); // var trialCriterionIds = trialCriterionList.Select(x => x.Id).ToList();
var systemQuestionList = await _readingQuestionSystemRepository.Where(x => x.ReadingQuestionCriterionSystemId == systemCriterionId).ToListAsync(); // var systemQuestionList = await _readingQuestionSystemRepository.Where(x => x.ReadingQuestionCriterionSystemId == systemCriterionId).ToListAsync();
var trialQuestions = await _readingQuestionTrialRepository.Where(x => trialCriterionIds.Contains(x.ReadingQuestionCriterionTrialId)).Select(x => new TrialQuestion // var trialQuestions = await _readingQuestionTrialRepository.Where(x => trialCriterionIds.Contains(x.ReadingQuestionCriterionTrialId)).Select(x => new TrialQuestion
{ // {
AnswerCombination = x.AnswerCombination, // AnswerCombination = x.AnswerCombination,
AnswerGroup = x.AnswerGroup, // AnswerGroup = x.AnswerGroup,
Id = x.Id, // Id = x.Id,
JudgeType = x.JudgeType, // JudgeType = x.JudgeType,
ReadingCriterionPageId = x.ReadingCriterionPageId, // ReadingCriterionPageId = x.ReadingCriterionPageId,
RelevanceId = x.RelevanceId, // RelevanceId = x.RelevanceId,
RelevanceValue = x.RelevanceValue, // RelevanceValue = x.RelevanceValue,
ImageCount = x.ImageCount, // ImageCount = x.ImageCount,
ParentId = x.ParentId, // ParentId = x.ParentId,
ReadingQuestionCriterionTrialId = x.ReadingQuestionCriterionTrialId, // ReadingQuestionCriterionTrialId = x.ReadingQuestionCriterionTrialId,
ReadingQuestionSystemId = x.ReadingQuestionSystemId, // ReadingQuestionSystemId = x.ReadingQuestionSystemId,
SystemParentId = x.SystemParentId // SystemParentId = x.SystemParentId
}).ToListAsync(); // }).ToListAsync();
List<ReadingQuestionTrial> trialQuestionList = new List<ReadingQuestionTrial>(); // List<ReadingQuestionTrial> trialQuestionList = new List<ReadingQuestionTrial>();
foreach (var item in trialCriterionList) // foreach (var item in trialCriterionList)
{ // {
var thisTrialQuestions = trialQuestions.Where(x => x.ReadingQuestionCriterionTrialId == item.Id).ToList(); // var thisTrialQuestions = trialQuestions.Where(x => x.ReadingQuestionCriterionTrialId == item.Id).ToList();
var query = systemQuestionList.GroupJoin(thisTrialQuestions, a => a.Id, b => b.ReadingQuestionSystemId, (a, b) => new // var query = systemQuestionList.GroupJoin(thisTrialQuestions, a => a.Id, b => b.ReadingQuestionSystemId, (a, b) => new
{ // {
a, // a,
trialQuestion = b // trialQuestion = b
}).SelectMany(a => a.trialQuestion, (m, n) => new ReadingQuestionTrial // }).SelectMany(a => a.trialQuestion, (m, n) => new ReadingQuestionTrial
{ // {
Id = n.Id, // Id = n.Id,
}); // });
var needAddQuestionList = systemQuestionList.GroupJoin(thisTrialQuestions, a => a.Id, b => b.ReadingQuestionSystemId, (x, y) => new { system = x, trial = y }) // var needAddQuestionList = systemQuestionList.GroupJoin(thisTrialQuestions, a => a.Id, b => b.ReadingQuestionSystemId, (x, y) => new { system = x, trial = y })
.SelectMany( // .SelectMany(
a => a.trial.DefaultIfEmpty(), // a => a.trial.DefaultIfEmpty(),
(c, d) => new ReadingQuestionTrial // (c, d) => new ReadingQuestionTrial
{ // {
Id = (c.trial.FirstOrDefault()?.Id) ?? NewId.NextGuid(), // Id = (c.trial.FirstOrDefault()?.Id) ?? NewId.NextGuid(),
ShowOrder = c.system.ShowOrder, // ShowOrder = c.system.ShowOrder,
SystemParentId = c.system.ParentId, // SystemParentId = c.system.ParentId,
ReadingQuestionSystemId = c.system.Id, // ReadingQuestionSystemId = c.system.Id,
AnswerCombination = (c.trial.FirstOrDefault()?.AnswerCombination) ?? string.Empty, // AnswerCombination = (c.trial.FirstOrDefault()?.AnswerCombination) ?? string.Empty,
AnswerGroup = (c.trial.FirstOrDefault()?.AnswerGroup) ?? string.Empty, // AnswerGroup = (c.trial.FirstOrDefault()?.AnswerGroup) ?? string.Empty,
GroupName = c.system.GroupName, // GroupName = c.system.GroupName,
IsEnable = c.system.IsEnable, // IsEnable = c.system.IsEnable,
ShowQuestion = c.system.ShowQuestion, // ShowQuestion = c.system.ShowQuestion,
IsJudgeQuestion = c.system.IsJudgeQuestion, // IsJudgeQuestion = c.system.IsJudgeQuestion,
IsRequired = c.system.IsRequired, // IsRequired = c.system.IsRequired,
JudgeType = (c.trial.FirstOrDefault()?.JudgeType) ?? JudgeTypeEnum.None, // JudgeType = (c.trial.FirstOrDefault()?.JudgeType) ?? JudgeTypeEnum.None,
ParentId = c.trial.FirstOrDefault()?.ParentId, // ParentId = c.trial.FirstOrDefault()?.ParentId,
ParentTriggerValue = c.system.ParentTriggerValue, // ParentTriggerValue = c.system.ParentTriggerValue,
QuestionName = c.system.QuestionName, // QuestionName = c.system.QuestionName,
ReadingCriterionPageId = c.trial.FirstOrDefault()?.ReadingCriterionPageId, // ReadingCriterionPageId = c.trial.FirstOrDefault()?.ReadingCriterionPageId,
RelevanceId = c.trial.FirstOrDefault()?.RelevanceId, // RelevanceId = c.trial.FirstOrDefault()?.RelevanceId,
ImageCount = c.trial.FirstOrDefault()?.ImageCount ?? 0, // ImageCount = c.trial.FirstOrDefault()?.ImageCount ?? 0,
RelevanceValue = c.trial.FirstOrDefault()?.RelevanceValue, // RelevanceValue = c.trial.FirstOrDefault()?.RelevanceValue,
ReadingQuestionCriterionTrialId = item.Id, // ReadingQuestionCriterionTrialId = item.Id,
Remark = c.system.Remark, // Remark = c.system.Remark,
TrialId = item.TrialId, // TrialId = item.TrialId,
Type = c.system.Type, // Type = c.system.Type,
TypeValue = c.system.TypeValue, // TypeValue = c.system.TypeValue,
}).ToList(); // }).ToList();
var copydata = needAddQuestionList.Clone(); // var copydata = needAddQuestionList.Clone();
needAddQuestionList.ForEach(x => // needAddQuestionList.ForEach(x =>
{ // {
if (x.SystemParentId == null) // if (x.SystemParentId == null)
{ // {
x.ParentId = null; // x.ParentId = null;
} // }
else // else
{ // {
x.ParentId = copydata.FirstOrDefault(y => y.ReadingQuestionSystemId == x.SystemParentId).Id; // x.ParentId = copydata.FirstOrDefault(y => y.ReadingQuestionSystemId == x.SystemParentId).Id;
} // }
}); // });
trialQuestionList.AddRange(needAddQuestionList); // trialQuestionList.AddRange(needAddQuestionList);
} // }
await _readingQuestionTrialRepository.BatchDeleteNoTrackingAsync(x => trialCriterionIds.Contains(x.ReadingQuestionCriterionTrialId)); // await _readingQuestionTrialRepository.BatchDeleteNoTrackingAsync(x => trialCriterionIds.Contains(x.ReadingQuestionCriterionTrialId));
await _readingQuestionCriterionTrialRepository.BatchUpdateNoTrackingAsync(x => trialCriterionIds.Contains(x.Id), x => new ReadingQuestionCriterionTrial() // await _readingQuestionCriterionTrialRepository.BatchUpdateNoTrackingAsync(x => trialCriterionIds.Contains(x.Id), x => new ReadingQuestionCriterionTrial()
{ // {
IsEnable = systemCriterion.IsEnable, // IsEnable = systemCriterion.IsEnable,
CriterionName = systemCriterion.CriterionName, // CriterionName = systemCriterion.CriterionName,
ShowOrder = systemCriterion.ShowOrder, // ShowOrder = systemCriterion.ShowOrder,
IsCompleteConfig = systemCriterion.IsCompleteConfig, // IsCompleteConfig = systemCriterion.IsCompleteConfig,
}); // });
await _readingQuestionTrialRepository.AddRangeAsync(trialQuestionList); // await _readingQuestionTrialRepository.AddRangeAsync(trialQuestionList);
// // //
await _readingQuestionTrialRepository.SaveChangesAsync(); // await _readingQuestionTrialRepository.SaveChangesAsync();
} //}
/// <summary> /// <summary>
@ -1194,87 +1194,87 @@ namespace IRaCIS.Application.Services
await _readingQuestionTrialRepository.SaveChangesAsync(); await _readingQuestionTrialRepository.SaveChangesAsync();
} }
/// <summary> ///// <summary>
/// 设置父子关系 ///// 设置父子关系
/// </summary> ///// </summary>
/// <param name="ReadingQuestionCriterionTrialId">项目标准ID</param> ///// <param name="ReadingQuestionCriterionTrialId">项目标准ID</param>
/// <param name="trialId">项目Id</param> ///// <param name="trialId">项目Id</param>
/// <param name="systemQuesitonList">系统问题</param> ///// <param name="systemQuesitonList">系统问题</param>
/// <param name="needQuestionList">需要添加list</param> ///// <param name="needQuestionList">需要添加list</param>
private void SetChildParentQuestion(Guid ReadingQuestionCriterionTrialId, Guid trialId, List<ReadingQuestionSystem> systemQuesitonList, List<ReadingQuestionTrial> needQuestionList) //private void SetChildParentQuestion(Guid ReadingQuestionCriterionTrialId, Guid trialId, List<ReadingQuestionSystem> systemQuesitonList, List<ReadingQuestionTrial> needQuestionList)
{ //{
var parentIdIsNullList = systemQuesitonList.Where(x => x.ParentId == null).ToList(); // var parentIdIsNullList = systemQuesitonList.Where(x => x.ParentId == null).ToList();
parentIdIsNullList.ForEach(x => // parentIdIsNullList.ForEach(x =>
{ // {
var quesiton = x.Clone(); // var quesiton = x.Clone();
var oldId = quesiton.Id; // var oldId = quesiton.Id;
var newId = NewId.NextGuid(); // var newId = NewId.NextGuid();
needQuestionList.Add(new ReadingQuestionTrial() // needQuestionList.Add(new ReadingQuestionTrial()
{ // {
Id = newId, // Id = newId,
ShowOrder = quesiton.ShowOrder, // ShowOrder = quesiton.ShowOrder,
IsEnable = quesiton.IsEnable, // IsEnable = quesiton.IsEnable,
IsRequired = quesiton.IsRequired, // IsRequired = quesiton.IsRequired,
ParentTriggerValue = quesiton.ParentTriggerValue, // ParentTriggerValue = quesiton.ParentTriggerValue,
QuestionName = quesiton.QuestionName, // QuestionName = quesiton.QuestionName,
ReadingQuestionCriterionTrialId = ReadingQuestionCriterionTrialId, // ReadingQuestionCriterionTrialId = ReadingQuestionCriterionTrialId,
ReadingQuestionSystemId = quesiton.Id, // ReadingQuestionSystemId = quesiton.Id,
SystemParentId = quesiton.ParentId, // SystemParentId = quesiton.ParentId,
TrialId = trialId, // TrialId = trialId,
AnswerGroup = string.Empty, // AnswerGroup = string.Empty,
Type = quesiton.Type, // Type = quesiton.Type,
GroupName = quesiton.GroupName, // GroupName = quesiton.GroupName,
IsJudgeQuestion = quesiton.IsJudgeQuestion, // IsJudgeQuestion = quesiton.IsJudgeQuestion,
Remark = quesiton.Remark, // Remark = quesiton.Remark,
TypeValue = quesiton.TypeValue, // TypeValue = quesiton.TypeValue,
}); // });
CreateQuestionRelation(ReadingQuestionCriterionTrialId, trialId, oldId, newId, systemQuesitonList, needQuestionList); // CreateQuestionRelation(ReadingQuestionCriterionTrialId, trialId, oldId, newId, systemQuesitonList, needQuestionList);
}); // });
} //}
/// <summary> ///// <summary>
/// 递归处理父子关系 ///// 递归处理父子关系
/// </summary> ///// </summary>
/// <param name="ReadingQuestionCriterionTrialId"></param> ///// <param name="ReadingQuestionCriterionTrialId"></param>
/// <param name="trialId"></param> ///// <param name="trialId"></param>
/// <param name="oldParentId"></param> ///// <param name="oldParentId"></param>
/// <param name="newParentId"></param> ///// <param name="newParentId"></param>
/// <param name="systemQuesitonList"></param> ///// <param name="systemQuesitonList"></param>
/// <param name="needQuestionList"></param> ///// <param name="needQuestionList"></param>
private void CreateQuestionRelation(Guid ReadingQuestionCriterionTrialId, Guid trialId, Guid oldParentId, Guid newParentId, List<ReadingQuestionSystem> systemQuesitonList, List<ReadingQuestionTrial> needQuestionList) //private void CreateQuestionRelation(Guid ReadingQuestionCriterionTrialId, Guid trialId, Guid oldParentId, Guid newParentId, List<ReadingQuestionSystem> systemQuesitonList, List<ReadingQuestionTrial> needQuestionList)
{ //{
var childList = systemQuesitonList.Where(x => x.ParentId == oldParentId).ToList(); // var childList = systemQuesitonList.Where(x => x.ParentId == oldParentId).ToList();
childList.ForEach(x => // childList.ForEach(x =>
{ // {
var quesiton = x.Clone(); // var quesiton = x.Clone();
var oldId = quesiton.Id; // var oldId = quesiton.Id;
var newId = NewId.NextGuid(); // var newId = NewId.NextGuid();
needQuestionList.Add(new ReadingQuestionTrial() // needQuestionList.Add(new ReadingQuestionTrial()
{ // {
Id = newId, // Id = newId,
ShowOrder = quesiton.ShowOrder, // ShowOrder = quesiton.ShowOrder,
IsEnable = quesiton.IsEnable, // IsEnable = quesiton.IsEnable,
IsRequired = quesiton.IsRequired, // IsRequired = quesiton.IsRequired,
ParentId = newParentId, // ParentId = newParentId,
SystemParentId = quesiton.ParentId, // SystemParentId = quesiton.ParentId,
ReadingQuestionSystemId = x.Id, // ReadingQuestionSystemId = x.Id,
AnswerGroup = string.Empty, // AnswerGroup = string.Empty,
ParentTriggerValue = quesiton.ParentTriggerValue, // ParentTriggerValue = quesiton.ParentTriggerValue,
QuestionName = quesiton.QuestionName, // QuestionName = quesiton.QuestionName,
ReadingQuestionCriterionTrialId = ReadingQuestionCriterionTrialId, // ReadingQuestionCriterionTrialId = ReadingQuestionCriterionTrialId,
TrialId = trialId, // TrialId = trialId,
GroupName = quesiton.GroupName, // GroupName = quesiton.GroupName,
Type = quesiton.Type, // Type = quesiton.Type,
IsJudgeQuestion = quesiton.IsJudgeQuestion, // IsJudgeQuestion = quesiton.IsJudgeQuestion,
Remark = quesiton.Remark, // Remark = quesiton.Remark,
TypeValue = quesiton.TypeValue, // TypeValue = quesiton.TypeValue,
}); // });
CreateQuestionRelation(ReadingQuestionCriterionTrialId, trialId, oldId, newId, systemQuesitonList, needQuestionList); // CreateQuestionRelation(ReadingQuestionCriterionTrialId, trialId, oldId, newId, systemQuesitonList, needQuestionList);
}); // });
} //}
#region 废弃 #region 废弃

2
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
View File

@ -118,7 +118,7 @@ namespace IRaCIS.Application.Services
.Select(y => new GlobalQuestionInfo() .Select(y => new GlobalQuestionInfo()
{ {
QuestionId = y.ReadingQuestionTrialId, QuestionId = y.ReadingQuestionTrialId,
QuestionName = y.ReadingQuestionTrial.QuestionName, QuestionName = y.ReadingQuestionTrial.QuestionName.LanguageName(y.ReadingQuestionTrial.QuestionEnName, _userInfo.IsEn_Us),
AnswerGroup = y.ReadingQuestionTrial.AnswerGroup, AnswerGroup = y.ReadingQuestionTrial.AnswerGroup,
QuestionType = y.ReadingQuestionTrial.QuestionType, QuestionType = y.ReadingQuestionTrial.QuestionType,
QuestionGenre = y.ReadingQuestionTrial.QuestionGenre, QuestionGenre = y.ReadingQuestionTrial.QuestionGenre,

19
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
View File

@ -388,7 +388,10 @@ namespace IRaCIS.Application.Services
.WhereIf(criterionIdInfo.IseCRFShowInDicomReading, x => x.ReadingQuestionCriterionTrialId == trialReadingCriterionId && x.Type != ReadingQestionType.Table) .WhereIf(criterionIdInfo.IseCRFShowInDicomReading, x => x.ReadingQuestionCriterionTrialId == trialReadingCriterionId && x.Type != ReadingQestionType.Table)
.WhereIf(!criterionIdInfo.IseCRFShowInDicomReading, x => x.IsShowInDicom && x.ReadingQuestionCriterionTrialId == trialReadingCriterionId && x.Type != ReadingQestionType.Table) .WhereIf(!criterionIdInfo.IseCRFShowInDicomReading, x => x.IsShowInDicom && x.ReadingQuestionCriterionTrialId == trialReadingCriterionId && x.Type != ReadingQestionType.Table)
.ProjectTo<DicomReadingQuestionAnswer>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync(); .ProjectTo<DicomReadingQuestionAnswer>(_mapper.ConfigurationProvider,new{
isEn_Us=_userInfo.IsEn_Us
}).OrderBy(x => x.ShowOrder).ToListAsync();
var answers = new List<ReadingTaskQuestionAnswer>(); var answers = new List<ReadingTaskQuestionAnswer>();
@ -569,7 +572,11 @@ namespace IRaCIS.Application.Services
{ {
var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstNotNullAsync(); var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstNotNullAsync();
var qusetionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId).ProjectTo<TrialReadQuestionData>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync(); var qusetionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId).ProjectTo<TrialReadQuestionData>(_mapper.ConfigurationProvider,new {
isEn_Us=_userInfo.IsEn_Us
}).OrderBy(x => x.ShowOrder).ToListAsync();
//是否是预览 //是否是预览
@ -697,7 +704,7 @@ namespace IRaCIS.Application.Services
ParentId = item.Id, ParentId = item.Id,
DataTableColumn = x.DataTableColumn, DataTableColumn = x.DataTableColumn,
LesionType = item.LesionType, LesionType = item.LesionType,
QuestionName = x.QuestionName, QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
RelationQuestions = new List<GetTrialReadingQuestionOutDto>(), RelationQuestions = new List<GetTrialReadingQuestionOutDto>(),
Remark = x.Remark, Remark = x.Remark,
ValueType = x.ValueType, ValueType = x.ValueType,
@ -1133,7 +1140,7 @@ namespace IRaCIS.Application.Services
catch (Exception) catch (Exception)
{ {
msg = _localizer["ReadingImage_Maximum", item.QuestionName, item.MaxRowCount.Value, rowCount] ; msg = _localizer["ReadingImage_Maximum", item.QuestionName.LanguageName(item.QuestionEnName, _userInfo.IsEn_Us), item.MaxRowCount.Value, rowCount] ;
} }
throw new BusinessValidationFailedException(msg); throw new BusinessValidationFailedException(msg);
@ -1354,7 +1361,7 @@ namespace IRaCIS.Application.Services
if (readingQuestionList.Count() > 0) if (readingQuestionList.Count() > 0)
{ {
throw new BusinessValidationFailedException(_localizer["ReadingImage_RequiredQuestion", string.Join(',', readingQuestionList.Select(x => x.QuestionName))]); throw new BusinessValidationFailedException(_localizer["ReadingImage_RequiredQuestion", string.Join(',', readingQuestionList.Select(x => x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us)))]);
} }
return ResponseOutput.Ok(true); return ResponseOutput.Ok(true);
} }
@ -1381,7 +1388,7 @@ namespace IRaCIS.Application.Services
if (readingQuestionList.Count() > 0) if (readingQuestionList.Count() > 0)
{ {
throw new BusinessValidationFailedException(_localizer["ReadingImage_RequiredQuestion", string.Join(',', readingQuestionList.Select(x => x.QuestionName))]); throw new BusinessValidationFailedException(_localizer["ReadingImage_RequiredQuestion", string.Join(',', readingQuestionList.Select(x => x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us)))]);
} }
await _readingCalculateService.VerifyVisitTaskQuestions(inDto); await _readingCalculateService.VerifyVisitTaskQuestions(inDto);

6
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
View File

@ -38,7 +38,7 @@ namespace IRaCIS.Application.Services
{ {
AnswerGroup = JsonConvert.DeserializeObject<List<string>>(x.AnswerGroup.IsNullOrEmpty() ? "[]" : x.AnswerGroup), AnswerGroup = JsonConvert.DeserializeObject<List<string>>(x.AnswerGroup.IsNullOrEmpty() ? "[]" : x.AnswerGroup),
AnswerCombination = JsonConvert.DeserializeObject<List<AnswerCombinationDto>>(x.AnswerCombination.IsNullOrEmpty() ? "[]" : x.AnswerCombination), AnswerCombination = JsonConvert.DeserializeObject<List<AnswerCombinationDto>>(x.AnswerCombination.IsNullOrEmpty() ? "[]" : x.AnswerCombination),
QuestionName = x.QuestionName, QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
PageName = x.ReadingCriterionPage.PageName, PageName = x.ReadingCriterionPage.PageName,
TypeValue = x.TypeValue, TypeValue = x.TypeValue,
QuestionGenre=x.QuestionGenre, QuestionGenre=x.QuestionGenre,
@ -147,7 +147,7 @@ namespace IRaCIS.Application.Services
ShowOrder = x.ReadingQuestionTrial.ShowOrder, ShowOrder = x.ReadingQuestionTrial.ShowOrder,
VisitTaskId = x.VisitTaskId, VisitTaskId = x.VisitTaskId,
QuestionId = x.ReadingQuestionTrial.Id, QuestionId = x.ReadingQuestionTrial.Id,
QuestionName = x.ReadingQuestionTrial.QuestionName, QuestionName = x.ReadingQuestionTrial.QuestionName.LanguageName(x.ReadingQuestionTrial.QuestionEnName, _userInfo.IsEn_Us),
QuestionGenre = x.ReadingQuestionTrial.QuestionGenre, QuestionGenre = x.ReadingQuestionTrial.QuestionGenre,
DictionaryCode = x.ReadingQuestionTrial.DictionaryCode, DictionaryCode = x.ReadingQuestionTrial.DictionaryCode,
@ -206,7 +206,7 @@ namespace IRaCIS.Application.Services
{ {
Answer = x.Answer, Answer = x.Answer,
QuestionId = x.ReadingQuestionTrial.Id, QuestionId = x.ReadingQuestionTrial.Id,
QuestionName = x.ReadingQuestionTrial.QuestionName, QuestionName = x.ReadingQuestionTrial.QuestionName.LanguageName(x.ReadingQuestionTrial.QuestionEnName, _userInfo.IsEn_Us),
QuestionGenre = x.ReadingQuestionTrial.QuestionGenre, QuestionGenre = x.ReadingQuestionTrial.QuestionGenre,
DictionaryCode = x.ReadingQuestionTrial.DictionaryCode, DictionaryCode = x.ReadingQuestionTrial.DictionaryCode,

12
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingTaskQuestionService.cs
View File

@ -65,7 +65,11 @@ namespace IRaCIS.Application.Services
var qusetionIds = qusetionList.Select(x => x.Id).ToList(); var qusetionIds = qusetionList.Select(x => x.Id).ToList();
var tableQuestionList = await _readingTableQuestionTrialRepository.Where(x => qusetionIds.Contains(x.ReadingQuestionId)) var tableQuestionList = await _readingTableQuestionTrialRepository.Where(x => qusetionIds.Contains(x.ReadingQuestionId))
.ProjectTo<TableQuestionDataInfo>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync(); .ProjectTo<TableQuestionDataInfo>(_mapper.ConfigurationProvider,x=>new {
isEn_Us=_userInfo.IsEn_Us
}).OrderBy(x => x.ShowOrder).ToListAsync();
if (inDto.FormType != null) if (inDto.FormType != null)
{ {
formType = inDto.FormType.Value; formType = inDto.FormType.Value;
@ -149,7 +153,7 @@ namespace IRaCIS.Application.Services
Type = data.Type, Type = data.Type,
ParentTriggerValue = data.ParentTriggerValue, ParentTriggerValue = data.ParentTriggerValue,
GroupName = data.GroupName, GroupName = data.GroupName,
QuestionName = data.QuestionName, QuestionName = data.QuestionName.LanguageName(data.QuestionEnName, _userInfo.IsEn_Us),
IsRequired = data.IsRequired, IsRequired = data.IsRequired,
ShowQuestion = data.ShowQuestion, ShowQuestion = data.ShowQuestion,
LesionType = data.LesionType, LesionType = data.LesionType,
@ -273,7 +277,9 @@ namespace IRaCIS.Application.Services
var questionIds = qusetionList.Select(x => x.Id).ToList(); var questionIds = qusetionList.Select(x => x.Id).ToList();
var tableQuestionList = await _readingTableQuestionSystemRepository.Where(x => questionIds.Contains(x.ReadingQuestionId)) var tableQuestionList = await _readingTableQuestionSystemRepository.Where(x => questionIds.Contains(x.ReadingQuestionId))
.ProjectTo<TableQuestionDataInfo>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync(); .ProjectTo<TableQuestionDataInfo>(_mapper.ConfigurationProvider,new {
isEn_Us=_userInfo.IsEn_Us,
}).OrderBy(x => x.ShowOrder).ToListAsync();
var groupList = new List<GetSystemReadingQuestionOutDto>(); var groupList = new List<GetSystemReadingQuestionOutDto>();

12
IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
View File

@ -11,6 +11,11 @@ namespace IRaCIS.Core.Application.Service
{ {
public ReadingConfig() public ReadingConfig()
{ {
//是否英文环境
var isEn_Us=false;
CreateMap<ReadingPeriodSetAddOrEdit, ReadingPeriodSet>(); CreateMap<ReadingPeriodSetAddOrEdit, ReadingPeriodSet>();
CreateMap<AddOrUpdateTumorAssessmentInDto, TumorAssessment>(); CreateMap<AddOrUpdateTumorAssessmentInDto, TumorAssessment>();
@ -78,8 +83,10 @@ namespace IRaCIS.Core.Application.Service
#region 阅片问题 #region 阅片问题
// 忽略列 // 忽略列
CreateMap<ReadingQuestionTrial, DicomReadingQuestionAnswer>() CreateMap<ReadingQuestionTrial, DicomReadingQuestionAnswer>()
.ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us?s.QuestionEnName:s.QuestionName))
.ForMember(dest => dest.ReadingCriterionPage, opt => opt.Ignore()) .ForMember(dest => dest.ReadingCriterionPage, opt => opt.Ignore())
.ForMember(dest => dest.ParentReadingQuestionTrial, opt => opt.Ignore()) .ForMember(dest => dest.ParentReadingQuestionTrial, opt => opt.Ignore())
.ForMember(dest => dest.RelevanceReadingQuestionTrial, opt => opt.Ignore()) .ForMember(dest => dest.RelevanceReadingQuestionTrial, opt => opt.Ignore())
@ -100,13 +107,15 @@ namespace IRaCIS.Core.Application.Service
.ForMember(d => d.ShowOrder, u => u.MapFrom(s => s.ReadingQuestionTrial.ShowOrder)); .ForMember(d => d.ShowOrder, u => u.MapFrom(s => s.ReadingQuestionTrial.ShowOrder));
CreateMap<ReadingQuestionTrial, TrialReadQuestionData>() CreateMap<ReadingQuestionTrial, TrialReadQuestionData>()
.ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName))
.ForMember(d => d.PageShowOrder, u => u.MapFrom(s => s.ReadingCriterionPage.ShowOrder)) .ForMember(d => d.PageShowOrder, u => u.MapFrom(s => s.ReadingCriterionPage.ShowOrder))
.ForMember(d => d.PageName, u => u.MapFrom(s => s.ReadingCriterionPage.PageName)) .ForMember(d => d.PageName, u => u.MapFrom(s => s.ReadingCriterionPage.PageName))
.ForMember(d => d.IsPublicPage, u => u.MapFrom(s => s.ReadingCriterionPage.IsPublicPage)); .ForMember(d => d.IsPublicPage, u => u.MapFrom(s => s.ReadingCriterionPage.IsPublicPage));
CreateMap<ReadingQuestionSystem, GetSystemReadingQuestionOutDto>(); CreateMap<ReadingQuestionSystem, GetSystemReadingQuestionOutDto>();
CreateMap<ReadingTableQuestionSystem, TableQuestionDataInfo>(); CreateMap<ReadingTableQuestionSystem, TableQuestionDataInfo>();
CreateMap<ReadingTableQuestionTrial, TableQuestionDataInfo>(); CreateMap<ReadingTableQuestionTrial, TableQuestionDataInfo>()
.ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName));
CreateMap<ReadingTableQuestionSystem, ReadingTableQuestionSystemView>() CreateMap<ReadingTableQuestionSystem, ReadingTableQuestionSystemView>()
.ForMember(d => d.DependShowOrder, u => u.MapFrom(s => s.DependParentQuestion.ShowOrder)); .ForMember(d => d.DependShowOrder, u => u.MapFrom(s => s.DependParentQuestion.ShowOrder));
@ -179,6 +188,7 @@ namespace IRaCIS.Core.Application.Service
#region IR阅片 #region IR阅片
CreateMap<ReadingQuestionTrial, GetTrialReadingQuestionOutDto>() CreateMap<ReadingQuestionTrial, GetTrialReadingQuestionOutDto>()
.ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName))
.ForMember(x=>x.Id, y=>y.MapFrom(z=>z.Id)); .ForMember(x=>x.Id, y=>y.MapFrom(z=>z.Id));
CreateMap<VisitTask, GetReadingPastResultListOutDto>() CreateMap<VisitTask, GetReadingPastResultListOutDto>()

3
IRaCIS.Core.Application/Service/ReadingCalculate/GeneralCalculateService.cs
View File

@ -1,5 +1,6 @@
using IRaCIS.Core.Application.Service.Reading.Dto; using IRaCIS.Core.Application.Service.Reading.Dto;
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
using IRaCIS.Core.Infra.EFCore.Common;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -69,7 +70,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{ {
LesionType = x.LesionType, LesionType = x.LesionType,
QuestionId = x.Id, QuestionId = x.Id,
QuesionName = x.QuestionName, QuesionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
QuestionType = x.QuestionType, QuestionType = x.QuestionType,
ValueType = x.ValueType, ValueType = x.ValueType,
}).ToListAsync(); }).ToListAsync();

8
IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
View File

@ -140,6 +140,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{ {
QuestionId = x.Id, QuestionId = x.Id,
GroupName = x.GroupName, GroupName = x.GroupName,
GroupEnName=x.GroupEnName,
IsShowInDicom = x.IsShowInDicom, IsShowInDicom = x.IsShowInDicom,
Type = x.Type, Type = x.Type,
QuestionType = x.QuestionType, QuestionType = x.QuestionType,
@ -148,7 +149,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
DataSource = x.DataSource, DataSource = x.DataSource,
DictionaryCode = x.DictionaryCode, DictionaryCode = x.DictionaryCode,
TypeValue = x.TypeValue, TypeValue = x.TypeValue,
QuestionName = x.QuestionName, QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
ShowOrder = x.ShowOrder, ShowOrder = x.ShowOrder,
ValueType = x.ValueType, ValueType = x.ValueType,
CustomUnit=x.CustomUnit, CustomUnit=x.CustomUnit,
@ -163,9 +164,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
item.Childrens = questionList.Where(x => x.GroupName == item.GroupName && x.Type != ReadingQestionType.Group).OrderBy(x => x.ShowOrder).Select(x => new ReadingReportDto() item.Childrens = questionList.Where(x => x.GroupName == item.GroupName && x.Type != ReadingQestionType.Group).OrderBy(x => x.ShowOrder).Select(x => new ReadingReportDto()
{ {
GroupName = x.GroupName, GroupName = x.GroupName,
GroupEnName=x.GroupEnName,
QuestionId = x.Id, QuestionId = x.Id,
IsShowInDicom = x.IsShowInDicom, IsShowInDicom = x.IsShowInDicom,
QuestionName = x.QuestionName, QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
LesionType = x.LesionType, LesionType = x.LesionType,
QuestionGenre = x.QuestionGenre, QuestionGenre = x.QuestionGenre,
DataSource = x.DataSource, DataSource = x.DataSource,
@ -222,7 +224,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
// tableQuestion // tableQuestion
row.Childrens = tableQuestionList.Where(x => x.ReadingQuestionId == question.QuestionId).Select(x => new ReadingReportDto() row.Childrens = tableQuestionList.Where(x => x.ReadingQuestionId == question.QuestionId).Select(x => new ReadingReportDto()
{ {
QuestionName = x.QuestionName, QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
QuestionId = x.ReadingQuestionId, QuestionId = x.ReadingQuestionId,
TableQuestionId = x.Id, TableQuestionId = x.Id,
Type = x.Type, Type = x.Type,

9
IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
View File

@ -120,6 +120,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{ {
QuestionId = x.Id, QuestionId = x.Id,
GroupName = x.GroupName, GroupName = x.GroupName,
GroupEnName=x.GroupName,
IsShowInDicom = x.IsShowInDicom, IsShowInDicom = x.IsShowInDicom,
Type = x.Type, Type = x.Type,
QuestionType = x.QuestionType, QuestionType = x.QuestionType,
@ -128,7 +129,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
DataSource = x.DataSource, DataSource = x.DataSource,
DictionaryCode = x.DictionaryCode, DictionaryCode = x.DictionaryCode,
TypeValue = x.TypeValue, TypeValue = x.TypeValue,
QuestionName = x.QuestionName, QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
ShowOrder = x.ShowOrder, ShowOrder = x.ShowOrder,
ValueType = x.ValueType, ValueType = x.ValueType,
Unit = x.Unit, Unit = x.Unit,
@ -144,7 +145,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
GroupName = x.GroupName, GroupName = x.GroupName,
QuestionId = x.Id, QuestionId = x.Id,
IsShowInDicom = x.IsShowInDicom, IsShowInDicom = x.IsShowInDicom,
QuestionName = x.QuestionName, GroupEnName=x.GroupEnName,
QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
LesionType = x.LesionType, LesionType = x.LesionType,
QuestionGenre = x.QuestionGenre, QuestionGenre = x.QuestionGenre,
DataSource = x.DataSource, DataSource = x.DataSource,
@ -199,12 +201,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
// tableQuestion // tableQuestion
row.Childrens = tableQuestionList.Where(x => x.ReadingQuestionId == question.QuestionId).Select(x => new ReadingReportDto() row.Childrens = tableQuestionList.Where(x => x.ReadingQuestionId == question.QuestionId).Select(x => new ReadingReportDto()
{ {
QuestionName = x.QuestionName, QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
QuestionId = x.ReadingQuestionId, QuestionId = x.ReadingQuestionId,
TableQuestionId = x.Id, TableQuestionId = x.Id,
Type = x.Type, Type = x.Type,
LesionType = question.LesionType, LesionType = question.LesionType,
TableQuestionType = x.TableQuestionType, TableQuestionType = x.TableQuestionType,
DataSource = x.DataSource, DataSource = x.DataSource,
DictionaryCode = x.DictionaryCode, DictionaryCode = x.DictionaryCode,
QuestionMark = x.QuestionMark, QuestionMark = x.QuestionMark,

9
IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs
View File

@ -119,14 +119,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
GroupName = x.GroupName, GroupName = x.GroupName,
IsShowInDicom = x.IsShowInDicom, IsShowInDicom = x.IsShowInDicom,
Type = x.Type, Type = x.Type,
GroupEnName=x.GroupEnName,
QuestionType = x.QuestionType, QuestionType = x.QuestionType,
DataSource= x.DataSource, DataSource= x.DataSource,
LesionType = x.LesionType, LesionType = x.LesionType,
QuestionGenre = x.QuestionGenre, QuestionGenre = x.QuestionGenre,
DictionaryCode = x.DictionaryCode, DictionaryCode = x.DictionaryCode,
TypeValue = x.TypeValue, TypeValue = x.TypeValue,
QuestionName = x.QuestionName, QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
ShowOrder = x.ShowOrder, ShowOrder = x.ShowOrder,
ValueType = x.ValueType, ValueType = x.ValueType,
Unit = x.Unit, Unit = x.Unit,
@ -142,10 +142,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
GroupName = x.GroupName, GroupName = x.GroupName,
QuestionId = x.Id, QuestionId = x.Id,
IsShowInDicom = x.IsShowInDicom, IsShowInDicom = x.IsShowInDicom,
QuestionName = x.QuestionName, QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
LesionType = x.LesionType, LesionType = x.LesionType,
DataSource = x.DataSource, DataSource = x.DataSource,
QuestionGenre = x.QuestionGenre, QuestionGenre = x.QuestionGenre,
GroupEnName=x.GroupEnName,
DictionaryCode = x.DictionaryCode, DictionaryCode = x.DictionaryCode,
Type = x.Type, Type = x.Type,
QuestionType = x.QuestionType, QuestionType = x.QuestionType,
@ -197,7 +198,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
// tableQuestion // tableQuestion
row.Childrens = tableQuestionList.Where(x => x.ReadingQuestionId == question.QuestionId).Select(x => new ReadingReportDto() row.Childrens = tableQuestionList.Where(x => x.ReadingQuestionId == question.QuestionId).Select(x => new ReadingReportDto()
{ {
QuestionName = x.QuestionName, QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
QuestionId = x.ReadingQuestionId, QuestionId = x.ReadingQuestionId,
TableQuestionId = x.Id, TableQuestionId = x.Id,
Type = x.Type, Type = x.Type,

2
IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
View File

@ -353,7 +353,7 @@ namespace IRaCIS.Core.Application
JudgeType = x.JudgeType, JudgeType = x.JudgeType,
QuestionId = x.Id, QuestionId = x.Id,
PageName=x.ReadingCriterionPage.PageName, PageName=x.ReadingCriterionPage.PageName,
QuestionName = x.QuestionName, QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
ReadingQuestionCriterionTrialId = x.ReadingQuestionCriterionTrialId ReadingQuestionCriterionTrialId = x.ReadingQuestionCriterionTrialId
}).ToListAsync(); }).ToListAsync();