S-51
parent
fa3e1a6c35
commit
f88bbee37b
|
@ -653,11 +653,13 @@ namespace IRaCIS.Core.Application.Service
|
||||||
})).CurrentPageData.SelectMany(x => x.ClinicalFormList).ToList();
|
})).CurrentPageData.SelectMany(x => x.ClinicalFormList).ToList();
|
||||||
|
|
||||||
var clinicalDataTrialSetIds = confirmList.Select(x => x.ClinicalDataTrialSetId).Distinct().ToList();
|
var clinicalDataTrialSetIds = confirmList.Select(x => x.ClinicalDataTrialSetId).Distinct().ToList();
|
||||||
|
var clinicalFormIds = confirmList.Select(x => x.ClinicalFormId).ToList();
|
||||||
|
|
||||||
var questionList = await _trialClinicalQuestionRepository.Where(x => clinicalDataTrialSetIds.Contains( x.TrialClinicalId)
|
var questionList = await _trialClinicalQuestionRepository.Where(x => clinicalDataTrialSetIds.Contains( x.TrialClinicalId)
|
||||||
&& x.ClinicalQuestionType != ReadingQestionType.Group
|
&& x.ClinicalQuestionType != ReadingQestionType.Group
|
||||||
&& x.ClinicalQuestionType != ReadingQestionType.Table).OrderBy(x=>x.TrialClinicalId).ThenBy(x => x.ShowOrder)
|
&& x.ClinicalQuestionType != ReadingQestionType.Table).OrderBy(x=>x.TrialClinicalId).ThenBy(x => x.ShowOrder)
|
||||||
.ProjectTo<TrialClinicalQuestionDto>(_mapper.ConfigurationProvider).ToListAsync();
|
.ProjectTo<TrialClinicalQuestionDto>(_mapper.ConfigurationProvider).ToListAsync();
|
||||||
var answers = await _clinicalQuestionAnswerRepository.Where(x => x.SubjectId == readModule.SubjectId && clinicalDataTrialSetIds.Contains( x.ClinicalDataTrialSetId))
|
var answers = await _clinicalQuestionAnswerRepository.Where(x => clinicalFormIds.Contains(x.ClinicalFormId))
|
||||||
.Select(x => new
|
.Select(x => new
|
||||||
{
|
{
|
||||||
x.ClinicalDataTrialSetId,
|
x.ClinicalDataTrialSetId,
|
||||||
|
|
Loading…
Reference in New Issue