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

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
hang 2025-01-22 10:14:41 +08:00
parent f76b66c35d 48a98de7cc
commit 0d2d3408b5
2 changed files with 27 additions and 1 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

@ -1896,6 +1896,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public List<ExportResult> ExportResult { get; set; } public List<ExportResult> ExportResult { get; set; }
public Guid? GroupId { get; set; }
public bool IsGroup { get; set; } = false;
/// <summary> /// <summary>
/// 导出的CDISCName /// 导出的CDISCName
/// </summary> /// </summary>

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

@ -127,10 +127,26 @@ namespace IRaCIS.Core.Application.Service
List<string> notShowType=new List<string>() { ReadingQestionType.Group, ReadingQestionType.Screenshot, ReadingQestionType.Summary, ReadingQestionType.Upload }; List<string> notShowType=new List<string>() { ReadingQestionType.Group, ReadingQestionType.Screenshot, ReadingQestionType.Summary, ReadingQestionType.Upload };
var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstNotNullAsync(); var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstNotNullAsync();
var groupList = await _readingQuestionTrialRepository.Where(x => x.Type== ReadingQestionType.Group && x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId)
.OrderBy(x => x.ShowOrder).Select(x => new TrialQuestionExport()
{
QuestionId = x.Id,
QuestionName = _userInfo.IsEn_Us ? x.GroupEnName : x.GroupName,
ExportResult = x.ExportResult,
GroupId= x.GroupId,
IsGroup= true,
ShowOrder = x.ShowOrder,
IsTableQuestion = false,
CDISCCode = x.CDISCCode,
}).ToListAsync();
var questionList = await _readingQuestionTrialRepository.Where(x => !notShowType.Contains(x.Type) && x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId) var questionList = await _readingQuestionTrialRepository.Where(x => !notShowType.Contains(x.Type) && x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId)
.OrderBy(x => x.ShowOrder).Select(x => new TrialQuestionExport() .OrderBy(x => x.ShowOrder).Select(x => new TrialQuestionExport()
{ {
QuestionId = x.Id, QuestionId = x.Id,
GroupId=x.GroupId,
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,
@ -158,6 +174,11 @@ namespace IRaCIS.Core.Application.Service
x.Children = tableQuestionList.Where(y => y.QuestionId == x.QuestionId).OrderBy(y => y.ShowOrder).ToList(); x.Children = tableQuestionList.Where(y => y.QuestionId == x.QuestionId).OrderBy(y => y.ShowOrder).ToList();
}); });
groupList.ForEach(x =>
{
x.Children = questionList.Where(y => y.GroupId == x.QuestionId).OrderBy(y => y.ShowOrder).ToList();
});
List<string> dicCode = new List<string>() { "1","2","8" }; List<string> dicCode = new List<string>() { "1","2","8" };
var dicList = await _dictionaryRepository.Where(x => x.Parent.Code == "ExportResult") var dicList = await _dictionaryRepository.Where(x => x.Parent.Code == "ExportResult")
.Where(x=> dicCode.Contains(x.Code)) .Where(x=> dicCode.Contains(x.Code))
@ -175,7 +196,7 @@ namespace IRaCIS.Core.Application.Service
CriterionType = criterionInfo.CriterionType, CriterionType = criterionInfo.CriterionType,
CriterionGroup = criterionInfo.CriterionGroup, CriterionGroup = criterionInfo.CriterionGroup,
DicList = dicList, DicList = dicList,
QuestionList = questionList QuestionList = groupList
}; };
} }