diff --git a/IRaCIS.Core.Application/Service/QC/Interface/INoneDicomStudyService.cs b/IRaCIS.Core.Application/Service/QC/Interface/INoneDicomStudyService.cs index a90a92c94..b5b881fb0 100644 --- a/IRaCIS.Core.Application/Service/QC/Interface/INoneDicomStudyService.cs +++ b/IRaCIS.Core.Application/Service/QC/Interface/INoneDicomStudyService.cs @@ -16,7 +16,7 @@ namespace IRaCIS.Core.Application.Contracts Task DeleteNoneDicomStudy(Guid noneDicomStudyId, Guid subjectVisitId); Task DeleteNoneDicomStudyFile(Guid noneDicomStudyFileId, Guid subjectVisitId); Task> GetNoneDicomStudyFileList(Guid noneDicomStudyId); - Task> GetNoneDicomStudyList(Guid subjectVisitId, Guid? sujectVisitId = null); + Task> GetNoneDicomStudyList(Guid subjectVisitId, Guid? sujectVisitId = null, bool isFilterZip=false); Task> GetVisitNoneDicomStudyFileList(Guid subjectVisitId); //Task UploadNoneDicomFile(IFormCollection formCollection, Guid subjectVisitId, Guid noneDicomStudyId); diff --git a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs index e6a40c3bf..005ca14d0 100644 --- a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs +++ b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs @@ -37,12 +37,12 @@ namespace IRaCIS.Core.Application.Contracts [HttpGet] - public async Task> GetNoneDicomStudyList([FromQuery, NotDefault] Guid subjectVisitId, Guid? nonedicomStudyId) + public async Task> GetNoneDicomStudyList([FromQuery, NotDefault] Guid subjectVisitId, [FromQuery] Guid? nonedicomStudyId, [FromQuery] bool isFilterZip) { var noneDicomStudyQueryable = _noneDicomStudyRepository.Where(t => t.SubjectVisitId == subjectVisitId).WhereIf(nonedicomStudyId != null, t => t.Id == nonedicomStudyId) - .ProjectTo(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken }); + .ProjectTo(_mapper.ConfigurationProvider, new { isFilterZip = isFilterZip }); return await noneDicomStudyQueryable.ToListAsync(); } diff --git a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs index dd1f9ad12..7bb30bb77 100644 --- a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs @@ -253,9 +253,10 @@ namespace IRaCIS.Core.Application.Service #endregion - - string token = string.Empty; + bool isFilterZip = false; + + string token = string.Empty; //一致性核查 CreateMap(); @@ -560,7 +561,7 @@ namespace IRaCIS.Core.Application.Service CreateMap() //.ForMember(d => d.FileCount, u => u.MapFrom(s => s.NoneDicomFileList.Count)) - .ForMember(d => d.NoneDicomStudyFileList, u => u.MapFrom(s => s.NoneDicomFileList.Where(t=>!t.FileType.Contains(StaticData.FileType.Zip)))) + .ForMember(d => d.NoneDicomStudyFileList, u => u.MapFrom(s => isFilterZip? s.NoneDicomFileList.Where(t=>!t.FileType.Contains(StaticData.FileType.Zip)): s.NoneDicomFileList)) .ForMember(d => d.CodeView, u => u.MapFrom(s => s.StudyCode));