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

修改一版

Uat_Study
he 2022-11-25 17:17:35 +08:00
parent ccaecf0726
commit 21d14636b6
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
View File

@ -441,6 +441,7 @@ namespace IRaCIS.Application.Services
ClinicalDataTrialSetId = x.ClinicalDataTrialSetId,
IsSign = x.IsSign,
ClinicalUploadType = x.ClinicalDataTrialSet.ClinicalUploadType,
CriterionEnumList= x.ClinicalDataTrialSet.CriterionEnumList,
Id = x.Id,
UploadRole = x.ClinicalDataTrialSet.UploadRole,
IsCRCUpload = x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC,
@ -455,6 +456,14 @@ namespace IRaCIS.Application.Services
var result = await resultQuery.ToListAsync();
// 根据标准
if (inDto.VisitTaskId != null)
{
var criterionType = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Include(x=>x.TrialReadingCriterion).Select(x => x.TrialReadingCriterion.CriterionType).FirstNotNullAsync();
result = result.Where(x => x.CriterionEnumList.Contains((int)criterionType)).ToList();
}
result = result.Where(x => !(x.ClinicalUploadType == ClinicalUploadType.PDF && x.FileList.Count() == 0)).ToList();
// 需要排除表格为空的数据

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

@ -317,6 +317,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public ClinicalUploadType ClinicalUploadType { get; set; }
/// <summary>
/// 标准枚举
/// </summary>
public List<int> CriterionEnumList { get; set; }
/// <summary>
/// 临床级别名称
/// </summary>