Uat_Study
parent
6a3ea02587
commit
bbd448347a
|
@ -162,7 +162,7 @@ namespace IRaCIS.Application.Services
|
|||
|
||||
|
||||
List<GetCRCClinicalDataOutDto> cRCClinicalDataList = await _readingClinicalDataRepository.Where(x => x.ReadingId == inDto.SubjectVisitId)
|
||||
.Where(x => x.ClinicalDataTrialSet.TrialId == inDto.TrialId && x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC && x.ClinicalDataTrialSet.ClinicalDataLevel != ClinicalLevel.ImageRead && x.ClinicalDataTrialSet.ClinicalDataLevel != ClinicalLevel.OncologyRead && x.ClinicalDataTrialSet.IsConfirm)
|
||||
.Where(x => x.ClinicalDataTrialSet.TrialId == inDto.TrialId && x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC && x.ClinicalDataTrialSet.ClinicalDataLevel != ClinicalLevel.ImageRead && x.ClinicalDataTrialSet.ClinicalDataLevel != ClinicalLevel.OncologyRead)
|
||||
.Select(x => new GetCRCClinicalDataOutDto()
|
||||
{
|
||||
Id = x.Id,
|
||||
|
|
|
@ -74,7 +74,13 @@ namespace IRaCIS.Application.Services
|
|||
{
|
||||
|
||||
#region MyRegion
|
||||
dto.SortField = dto.SortField.IsNullOrEmpty() ? nameof(ReadModuleView.SubjectCode) : dto.SortField;
|
||||
|
||||
if (dto.SortField.IsNullOrEmpty())
|
||||
{
|
||||
dto.SortField = nameof(ReadModuleView.SubjectCode);
|
||||
dto.Asc = true;
|
||||
}
|
||||
|
||||
dto.SortField = dto.Asc ? dto.SortField : dto.SortField + " desc";
|
||||
var subjectQuery = _readModuleViewRepository.Where(x => x.TrialReadingCriterionId == dto.TrialReadingCriterionId)
|
||||
.WhereIf(dto.TrialId != null, x => x.TrialId == dto.TrialId)
|
||||
|
|
Loading…
Reference in New Issue