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

修改

Uat_IRC_Net8
he 2025-01-13 15:22:54 +08:00
parent e022eb058b
commit f8fea6561d
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
View File

@ -1877,6 +1877,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class GetTrialQuestionExportResultOutDto public class GetTrialQuestionExportResultOutDto
{ {
public CriterionType CriterionType { get; set; }
public CriterionGroup CriterionGroup { get; set; }
public List<TrialQuestionExport> QuestionList = new List<TrialQuestionExport>(); public List<TrialQuestionExport> QuestionList = new List<TrialQuestionExport>();
public List<TrialQuestionExportDic> DicList = new List<TrialQuestionExportDic>(); public List<TrialQuestionExportDic> DicList = new List<TrialQuestionExportDic>();
@ -1900,6 +1903,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public int ShowOrder { get; set; } public int ShowOrder { get; set; }
public bool IsTableQuestion { get; set; }
public bool HasChildren => Children.Count() > 0; public bool HasChildren => Children.Count() > 0;
public List<TrialQuestionExport> Children { get; set; } = new List<TrialQuestionExport>(); public List<TrialQuestionExport> Children { get; set; } = new List<TrialQuestionExport>();

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

@ -117,6 +117,8 @@ namespace IRaCIS.Core.Application.Service
[HttpPost] [HttpPost]
public async Task<GetTrialQuestionExportResultOutDto> GetTrialQuestionExportResult(GetTrialQuestionExportResultInDto inDto) public async Task<GetTrialQuestionExportResultOutDto> GetTrialQuestionExportResult(GetTrialQuestionExportResultInDto inDto)
{ {
var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstNotNullAsync();
var questionList = await _readingQuestionTrialRepository.Where(x => x.Type != ReadingQestionType.Group && x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId) var questionList = await _readingQuestionTrialRepository.Where(x => x.Type != ReadingQestionType.Group && x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId)
.OrderBy(x => x.ShowOrder).Select(x => new TrialQuestionExport() .OrderBy(x => x.ShowOrder).Select(x => new TrialQuestionExport()
{ {
@ -124,6 +126,7 @@ namespace IRaCIS.Core.Application.Service
QuestionName = _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName, QuestionName = _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName,
ExportResult = x.ExportResult, ExportResult = x.ExportResult,
ShowOrder = x.ShowOrder, ShowOrder = x.ShowOrder,
IsTableQuestion=false,
CDISCCode = x.CDISCCode, CDISCCode = x.CDISCCode,
}).ToListAsync(); }).ToListAsync();
@ -137,6 +140,7 @@ namespace IRaCIS.Core.Application.Service
QuestionName = _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName, QuestionName = _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName,
ExportResult = x.ExportResult, ExportResult = x.ExportResult,
ShowOrder = x.ShowOrder, ShowOrder = x.ShowOrder,
IsTableQuestion=true,
CDISCCode = x.CDISCCode, CDISCCode = x.CDISCCode,
}).ToListAsync(); }).ToListAsync();
@ -159,6 +163,8 @@ namespace IRaCIS.Core.Application.Service
return new GetTrialQuestionExportResultOutDto() return new GetTrialQuestionExportResultOutDto()
{ {
CriterionType = criterionInfo.CriterionType,
CriterionGroup = criterionInfo.CriterionGroup,
DicList = dicList, DicList = dicList,
QuestionList = questionList QuestionList = questionList
}; };