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

修改一版

Uat_Study
he 2022-07-11 11:23:00 +08:00
parent 1b0827b04e
commit 3ee005e93d
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
View File

@ -296,7 +296,7 @@ namespace IRaCIS.Application.Services
{
var readingTaskState = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Select(x => x.ReadingTaskState).FirstOrDefaultAsync();
var query= from data in _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId==inDto.ReadingQuestionCriterionTrialId)
var query= from data in _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId==inDto.ReadingQuestionCriterionTrialId&&x.Type!= "group")
join questionAnswer in _readingTaskQuestionAnswerRepository.Where(x=>x.VisitTaskId==inDto.VisitTaskId) on data.Id equals questionAnswer.ReadingQuestionTrialId into questionAnswerTemp
from leftquestionAnswer in questionAnswerTemp.DefaultIfEmpty()
select new GetTrialReadingQuestionOutDto()
@ -319,29 +319,29 @@ namespace IRaCIS.Application.Services
var qusetionList =await query.OrderBy(x=>x.ShowOrder).ToListAsync();
var groupList = qusetionList.Where(x => x.Type == "group").ToList();
groupList.ForEach(x =>
{
x.Childrens = qusetionList.Where(y => y.GroupName == x.GroupName && y.ParentId == null).ToList();
x.Childrens.ForEach(z =>
{
this.FindChildQuestion(z, qusetionList);
});
});
//List<GetTrialReadingQuestionOutDto> groupList = qusetionList.Where(x => x.ParentId == null).ToList();
//var groupList = qusetionList.Where(x => x.Type == "group").ToList();
//groupList.ForEach(x =>
//{
// this.FindChildQuestion(x, qusetionList);
// x.Childrens = qusetionList.Where(y => y.GroupName == x.GroupName && y.ParentId == null).ToList();
// x.Childrens.ForEach(z =>
// {
// this.FindChildQuestion(z, qusetionList);
// });
//});
List<GetTrialReadingQuestionOutDto> groupList = qusetionList.Where(x => x.ParentId == null).ToList();
groupList.ForEach(x =>
{
this.FindChildQuestion(x, qusetionList);
});
return (groupList, new
{
readingTaskState = readingTaskState