diff --git a/IRaCIS.Core.Application/Service/QC/Interface/INoneDicomStudyService.cs b/IRaCIS.Core.Application/Service/QC/Interface/INoneDicomStudyService.cs index 0393b5df..459b6c5e 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); + Task> GetNoneDicomStudyList(Guid subjectVisitId, Guid? sujectVisitId = null); 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 3b958ebb..65959159 100644 --- a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs +++ b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs @@ -14,13 +14,8 @@ using IRaCIS.Core.Application.Service.Inspection.DTO; using Nito.AsyncEx; using IRaCIS.Application.Interfaces; using IRaCIS.Core.Infrastructure; - using Microsoft.Extensions.Logging; -using Microsoft.AspNetCore.Authorization; -using System.Drawing; -using SixLabors.ImageSharp.Processing; -using SixLabors.ImageSharp; -using IRaCIS.Core.Application.Helper; +using System.ComponentModel.DataAnnotations; namespace IRaCIS.Core.Application.Contracts { @@ -75,11 +70,12 @@ namespace IRaCIS.Core.Application.Contracts } } - [HttpGet("{subjectVisitId:guid}")] - public async Task> GetNoneDicomStudyList(Guid subjectVisitId) + [HttpGet] + public async Task> GetNoneDicomStudyList( [FromQuery,NotDefault] Guid subjectVisitId,Guid? nonedicomStudyId) { - var noneDicomStudyQueryable = _noneDicomStudyRepository.Where(t => t.SubjectVisitId == subjectVisitId) + var noneDicomStudyQueryable = _noneDicomStudyRepository.Where(t => t.SubjectVisitId == subjectVisitId).WhereIf(nonedicomStudyId!=null , t => t.Id== nonedicomStudyId) + .ProjectTo(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken }); return await noneDicomStudyQueryable.ToListAsync(); @@ -212,7 +208,8 @@ namespace IRaCIS.Core.Application.Contracts [HttpGet("{subjectVisitId:guid}")] public async Task> GetVisitNoneDicomStudyFileList(Guid subjectVisitId) { - return await _repository.Where(t => t.NoneDicomStudy.SubjectVisitId == subjectVisitId).ProjectTo(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken }).ToListAsync(); + return await _repository.Where(t => t.NoneDicomStudy.SubjectVisitId == subjectVisitId) + .ProjectTo(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken }).ToListAsync(); }