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-08 10:37:06 +08:00
parent 35ca08ee04 0781496c69
commit cbfc2f9538
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,16 +58,10 @@ namespace IRaCIS.Core.Application.Service
{ {
List<ExportResult> needAdd = new List<ExportResult>() List<ExportResult> needAdd = new List<ExportResult>()
{ {
ExportResult.DetailedTableOfAdjudicationResults,
ExportResult.DetailedTableOfIntraReaderAnalysisResults,
ExportResult.DetailedTableOfInterReaderAnalysisResults
}; };
if (inDto.ExportType == ExportType.Basic)
{
needAdd = new List<ExportResult>()
{
ExportResult.DetailedTableOfAdjudicationResults,
ExportResult.DetailedTableOfIntraReaderAnalysisResults,
ExportResult.DetailedTableOfInterReaderAnalysisResults
};
}
foreach (var item in inDto.QuestionList) foreach (var item in inDto.QuestionList)
{ {
item.ExportResult= item.ExportResult.Except(needAdd).ToList(); item.ExportResult= item.ExportResult.Except(needAdd).ToList();
@ -141,12 +135,7 @@ 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();
}); });
List<string> dicCode = new List<string>() { "1","2"}; List<string> dicCode = new List<string>() { "1","2", "8" };
if (inDto.ExportType == ExportType.CDISC)
{
dicCode = new List<string>() { "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))
.OrderBy(x => x.ShowOrder) .OrderBy(x => x.ShowOrder)