Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api
commit
12c67cac8f
|
@ -309,7 +309,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
|
||||
public class GetTaskAdditionalQuestionInDto
|
||||
{
|
||||
public Guid TrialReadingCriterionId { get; set; }
|
||||
//public Guid TrialReadingCriterionId { get; set; }
|
||||
public Guid VisitTaskId { get; set; }
|
||||
}
|
||||
|
||||
|
|
|
@ -135,7 +135,8 @@ namespace IRaCIS.Application.Services
|
|||
[HttpPost]
|
||||
public async Task<(List<TrialReadQuestion>,bool)> GetTaskAdditionalQuestion(GetTaskAdditionalQuestionInDto inDto)
|
||||
{
|
||||
var result= await _readingQuestionTrialRepository.Where(x => x.IsAdditional && x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId).IgnoreQueryFilters().ProjectTo<TrialReadQuestion>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();
|
||||
var taskInfo = await _visitTaskRepository.Where(x => inDto.VisitTaskId == x.Id).FirstNotNullAsync();
|
||||
var result= await _readingQuestionTrialRepository.Where(x => x.IsAdditional && x.ReadingQuestionCriterionTrialId == taskInfo.TrialReadingCriterionId).IgnoreQueryFilters().ProjectTo<TrialReadQuestion>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();
|
||||
return (result,true);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue