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

项目site 勾选过滤

Uat_Study
hang 2022-04-19 11:25:23 +08:00
parent e68e9c8fbf
commit 1d8eb3e33b
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -364,3 +364,4 @@ FodyWeavers.xsd
/UploadFile/Check
/TrialData/281bdb09-f792-4faa-de18-08da0e042672/50d0cf71-ee4d-4e54-af06-490f8be1bff1/72b8ef0b-4adc-465e-fa25-08da122bbd9c/eb53c5e2-6307-42f3-d710-08da122bbde1/Dicom
/TrialData/4067198c-f9c4-47de-705a-08da12df3a17/6dedb49c-874c-4f7c-5c0d-08d947774c19
/TrialData/2a864970-1832-4cf9-f3ab-08da0cd341a0/01a4d468-caa4-41a2-ab36-c42ba30130ac/3210c828-cf32-4a70-fa40-08da0cd72d16/9a3b5449-ac01-4df1-bf24-08da0cd72d2a/Dicom/d287dde0-b9d1-9b37-28bb-371b6a445cf1

2
IRaCIS.Core.Application/Service/Management/MenuService.cs
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();
}

3
IRaCIS.Core.Application/Service/QC/QCListService.cs
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 };

2
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialSiteViewModel.cs
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;

4
IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs
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))

4
IRaCIS.Core.Infra.EFCore/Repository/Repository.cs
View File

@ -104,7 +104,6 @@ namespace IRaCIS.Core.Infra.EFCore
}
private async Task EntityVerifyAsync(bool isAdd, EntityVerifyExp<TEntity>[] verify, Guid? entitydId = null)
{
@ -151,11 +150,12 @@ namespace IRaCIS.Core.Infra.EFCore
await SaveChangesAsync(autoSave);
return entity;
return entity;
}
/// <summary>
/// 用前端传递的视图模型字段，更新，同时返回数据库该条记录的原始信息，方便对比某些字段是否更改，进行相应的逻辑操作
/// </summary>