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

项目site 勾选过滤

Browse Source
This commit is contained in:
hang
2022-04-19 11:25:23 +08:00
parent e68e9c8fbf
commit 1d8eb3e33b
6 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Management/MenuService.cs
+1 -1
View File
@@ -136,7 +136,7 @@ namespace IRaCIS.Application.Services
.WhereIf(menuQueyDTO.IsInTabDisplay != null, t => t.IsInTabDisplay == menuQueyDTO.IsInTabDisplay)
.WhereIf(menuQueyDTO.MenuType != null, t => t.MenuType == menuQueyDTO.MenuType)
.ProjectTo<MenuDTO>(_mapper.ConfigurationProvider).ToListAsync();
.ProjectTo<MenuDTO>(_mapper.ConfigurationProvider).OrderBy(t=>t.ShowOrder).ToListAsync();
}
IRaCIS.Core.Application/Service/QC/QCListService.cs
+2 -1
View File
@@ -631,7 +631,8 @@ namespace IRaCIS.Core.Application.Image.QA
var studyList = await _repository.Where<DicomStudy>(s => s.SubjectVisitId == subjectVisitId).IgnoreQueryFilters().ProjectTo<QAStudyInfoDTO>(_mapper.ConfigurationProvider).ToListAsync();
var studyIds = studyList.Select(t => t.StudyId).ToList();
var seriesList = await _repository.Where<DicomSeries>(t => studyIds.Contains(t.StudyId)).IgnoreQueryFilters().ProjectTo<QASeriesInfoDto>(_mapper.ConfigurationProvider).ToListAsync();
var seriesList = await _repository.Where<DicomSeries>(t => studyIds.Contains(t.StudyId)).IgnoreQueryFilters().ProjectTo<QASeriesInfoDto>(_mapper.ConfigurationProvider)
.OrderBy(t=>t.StudyCode).ThenBy(t=>t.SeriesNumber).ToListAsync();
return new QAStudySeriesInfo { StudyList = studyList, SeriesList = seriesList };
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialSiteViewModel.cs
+1 -1
View File
@@ -106,7 +106,7 @@ namespace IRaCIS.Core.Application.Contracts.DTO
public string SiteCode { get; set; } = String.Empty;
public string City { get; set; } = String.Empty;
public string Country { get; set; } = String.Empty;
public Guid HospitalId { get; set; } = Guid.Empty;
public Guid? HospitalId { get; set; }
public string HospitalName { get; set; } = String.Empty;
IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs
+2 -2
View File
@@ -193,7 +193,7 @@ namespace IRaCIS.Core.Application.Services
// 之前选择了的不能再次出现在列表，做的时候我就不建议这样搞，搞好了 现在又要改回去。。。 瞎折腾。。。。
var siteQueryable = _siteRepository
var siteQueryable = _siteRepository.AsQueryable(true)
.WhereIf(!string.IsNullOrWhiteSpace(trialSiteQuery.SiteName.Trim()), t => t.SiteName.Contains(trialSiteQuery.SiteName.Trim()))
.ProjectTo<TrialSiteScreeningDTO>(_mapper.ConfigurationProvider, new { trialId = trialSiteQuery.TrialId });
@@ -250,7 +250,7 @@ namespace IRaCIS.Core.Application.Services
if (await _repository.AnyAsync<Subject>(t => t.SiteId == siteId && t.TrialId == trialId))
{
return ResponseOutput.NotOk("The subjects has been added to this site, and couldn't be deleted.");
return ResponseOutput.NotOk("The subjects has been added to this site, and couldn't be disable.");
}
//if (await _repository.AnyAsync<DicomStudy>(t => t.SiteId == siteId && t.TrialId == trialId))