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

代码修改
continuous-integration/drone/push Build is running
Details

Browse Source
This commit is contained in:
he
2025-01-02 15:03:26 +08:00
parent 2e7cbbb8b0
commit 141fbc2e75
8 changed files with 18814 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+10
View File
@@ -10443,6 +10443,16 @@
分类显示类型 是否显示
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SetTrialQuestionExport.CDISCCode">
<summary>
导出的CDISCName
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TrialQuestionExport.CDISCCode">
<summary>
导出的CDISCName
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialGroupNameListInDto.CriterionId">
<summary>
标准ID
IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+22
View File
@@ -1839,6 +1839,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class SetTrialQuestionExportResultInDto
{
public ExportType ExportType { get; set; }
public List<SetTrialQuestionExport> QuestionList = new List<SetTrialQuestionExport>();
public List<SetTrialQuestionExport> TableQuestionList = new List<SetTrialQuestionExport>();
@@ -1851,6 +1854,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid? TableQuestionId { get; set; }
/// <summary>
/// 导出的CDISCName
/// </summary>
public string CDISCCode { get; set; } = string.Empty;
public List<ExportResult> ExportResult { get; set; }
}
@@ -1859,8 +1866,18 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
{
[NotDefault]
public Guid TrialReadingCriterionId { get; set; }
public ExportType ExportType { get; set; }
}
public enum ExportType
{
Basic=0,
CDISC=1,
}
public class GetTrialQuestionExportResultOutDto
{
public List<TrialQuestionExport> QuestionList = new List<TrialQuestionExport>();
@@ -1879,6 +1896,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public List<ExportResult> ExportResult { get; set; }
/// <summary>
/// 导出的CDISCName
/// </summary>
public string CDISCCode { get; set; } = string.Empty;
public int ShowOrder { get; set; }
public bool HasChildren => Children.Count() > 0;
IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
+47 -12
View File
@@ -58,10 +58,16 @@ namespace IRaCIS.Core.Application.Service
{
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)
{
item.ExportResult= item.ExportResult.Except(needAdd).ToList();
@@ -69,13 +75,23 @@ namespace IRaCIS.Core.Application.Service
{
item.ExportResult.AddRange(needAdd);
}
var ExportResultStr=JsonConvert.SerializeObject(item.ExportResult);
await _readingQuestionTrialRepository.UpdatePartialFromQueryAsync(x => x.Id == item.QuestionId, x => new ReadingQuestionTrial()
if (inDto.ExportType == ExportType.Basic)
{
ExportResultStr = ExportResultStr
});
await _readingQuestionTrialRepository.UpdatePartialFromQueryAsync(x => x.Id == item.QuestionId, x => new ReadingQuestionTrial()
{
ExportResultStr = ExportResultStr
});
}
else if (inDto.ExportType == ExportType.CDISC)
{
await _readingQuestionTrialRepository.UpdatePartialFromQueryAsync(x => x.Id == item.QuestionId, x => new ReadingQuestionTrial()
{
ExportResultStr = ExportResultStr,
CDISCCode = item.CDISCCode,
});
}
}
foreach (var item in inDto.TableQuestionList)
@@ -87,10 +103,23 @@ namespace IRaCIS.Core.Application.Service
}
var ExportResultStr = JsonConvert.SerializeObject(item.ExportResult);
await _readingTableQuestionTrialRepository.UpdatePartialFromQueryAsync(x => x.Id == item.TableQuestionId, x => new ReadingTableQuestionTrial()
if (inDto.ExportType == ExportType.Basic)
{
ExportResultStr = ExportResultStr
});
await _readingTableQuestionTrialRepository.UpdatePartialFromQueryAsync(x => x.Id == item.TableQuestionId, x => new ReadingTableQuestionTrial()
{
ExportResultStr = ExportResultStr
});
}
else if (inDto.ExportType == ExportType.CDISC)
{
await _readingTableQuestionTrialRepository.UpdatePartialFromQueryAsync(x => x.Id == item.TableQuestionId, x => new ReadingTableQuestionTrial()
{
ExportResultStr = ExportResultStr,
CDISCCode=item.CDISCCode,
});
}
}
return await _readingTableQuestionTrialRepository.SaveChangesAsync();
@@ -111,7 +140,7 @@ namespace IRaCIS.Core.Application.Service
QuestionName = _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName,
ExportResult = x.ExportResult,
ShowOrder = x.ShowOrder,
CDISCCode = x.CDISCCode,
}).ToListAsync();
var questionid = questionList.Select(x => x.QuestionId).ToList();
@@ -124,6 +153,7 @@ namespace IRaCIS.Core.Application.Service
QuestionName = _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName,
ExportResult = x.ExportResult,
ShowOrder = x.ShowOrder,
CDISCCode = x.CDISCCode,
}).ToListAsync();
questionList.ForEach(x =>
@@ -132,6 +162,11 @@ namespace IRaCIS.Core.Application.Service
});
List<string> dicCode = new List<string>() { "1","2"};
if (inDto.ExportType == ExportType.CDISC)
{
dicCode = new List<string>() { "8" };
}
var dicList = await _dictionaryRepository.Where(x => x.Parent.Code == "ExportResult")
.Where(x=> dicCode.Contains(x.Code))
.OrderBy(x => x.ShowOrder)