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

代码修改

IRC_NewDev
he 2023-12-20 16:56:18 +08:00
parent 6d4ce03c10
commit fa9573cf54
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs
View File

@ -121,9 +121,23 @@ namespace IRaCIS.Core.Application.Service
var questions = await _systemClinicalQuestionRepository.Where(x => x.SystemClinicalId == inDto.SystemClinicalId)
.ProjectTo<ClinicalQuestionPreviewDto>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();
if (_userInfo.IsEn_Us)
{
questions.ForEach(x => {
x.GroupName = x.GroupEnName;
x.QuestionName = x.QuestionEnName;
});
}
var tableQuestions= await _systemClinicalTableQuestionRepository.Where(x => x.SystemClinicalId == inDto.SystemClinicalId)
.ProjectTo<ClinicalTablePreviewDto>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();
if (_userInfo.IsEn_Us)
{
tableQuestions.ForEach(x => {
x.QuestionName = x.QuestionEnName;
});
}
questions.ForEach(x => x.CreateTime = null);
var result = questions.Where(x => x.ClinicalQuestionType == ReadingQestionType.Group).ToList();
@ -146,10 +160,26 @@ namespace IRaCIS.Core.Application.Service
{
var questions = await _trialClinicalQuestionRepository.Where(x => x.TrialClinicalId == inDto.TrialClinicalId)
.ProjectTo<ClinicalQuestionPreviewDto>(_mapper.ConfigurationProvider).OrderBy(x=>x.ShowOrder).ToListAsync();
if (_userInfo.IsEn_Us)
{
questions.ForEach(x => {
x.GroupName = x.GroupEnName;
x.QuestionName = x.QuestionEnName;
});
}
var tableQuestions = await _trialClinicalTableQuestionRepository.Where(x => x.TrialClinicalId == inDto.TrialClinicalId)
.ProjectTo<ClinicalTablePreviewDto>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();
if (_userInfo.IsEn_Us)
{
tableQuestions.ForEach(x => {
x.QuestionName = x.QuestionEnName;
});
}
questions.ForEach(x => x.CreateTime = null);
var result = questions.Where(x => x.ClinicalQuestionType == ReadingQestionType.Group).OrderBy(x => x.ShowOrder).ToList();

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

@ -50,7 +50,9 @@ namespace IRaCIS.Core.Application.Service
// 预览
CreateMap<TrialClinicalQuestion, ClinicalQuestionPreviewDto>();
CreateMap<SystemClinicalQuestion, ClinicalQuestionPreviewDto>();
CreateMap<SystemClinicalTableQuestion, ClinicalTablePreviewDto>();
CreateMap<TrialClinicalTableQuestion, ClinicalTablePreviewDto>();
#endregion