修改一版

Uat_Study
he 2022-06-30 13:55:33 +08:00
parent 7e66fc067a
commit d5e8916934
1 changed files with 6 additions and 4 deletions

View File

@ -306,8 +306,10 @@ namespace IRaCIS.Application.Services
var resultQuery = _readingClinicalDataRepository.Where(x => x.SubjectId == inDto.SubjectId)
.Where(x => x.ReadingId == inDto.ReadingId)
.WhereIf(inDto.UploadRole == UploadRole.CRC, x => x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC)
.Where(x => x.ClinicalDataTrialSet.UploadRole != UploadRole.CRC&&x.ClinicalDataTrialSet.ClinicalUploadType!=ClinicalUploadType.PDF&&x.ReadingClinicalDataPDFList.Count()!=0)
//.WhereIf(inDto.UploadRole == UploadRole.PM && !isBaseLine, x => x.ClinicalDataTrialSet.UploadRole == UploadRole.PM)
.Select(x => new GetReadingClinicalDataListOutDto() {
.Select(x => new GetReadingClinicalDataListOutDto()
{
ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel,
SubjectId = x.SubjectId,
ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName,
@ -315,14 +317,14 @@ namespace IRaCIS.Application.Services
IsSign = x.IsSign,
ClinicalUploadType = x.ClinicalDataTrialSet.ClinicalUploadType,
Id = x.Id,
UploadRole=x.ClinicalDataTrialSet.UploadRole,
UploadRole = x.ClinicalDataTrialSet.UploadRole,
IsCRCUpload = x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC,
FileList = x.ReadingClinicalDataPDFList.Select(y => new GetFileDto()
{
Id = y.Id,
FileName = y.FileName,
Path = y.Path,
CreateTime=y.CreateTime,
CreateTime = y.CreateTime,
}).ToList()
});