From 2fc4bbc5c187ca5b9a7f1ec8f79ae7c13135f8ec Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 20 May 2022 14:17:08 +0800
Subject: [PATCH] =?UTF-8?q?noneDicm=20=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../QC/Interface/INoneDicomStudyService.cs      |  2 +-
 .../Service/QC/NoneDicomStudyService.cs         | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

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<IResponseOutput> DeleteNoneDicomStudy(Guid noneDicomStudyId, Guid subjectVisitId);
         Task<IResponseOutput> DeleteNoneDicomStudyFile(Guid noneDicomStudyFileId, Guid subjectVisitId);
         Task<List<NoneDicomStudyFileView>> GetNoneDicomStudyFileList(Guid noneDicomStudyId);
-        Task<List<NoneDicomStudyView>> GetNoneDicomStudyList(Guid subjectVisitId);
+        Task<List<NoneDicomStudyView>> GetNoneDicomStudyList(Guid subjectVisitId, Guid? sujectVisitId = null);
         Task<List<NoneDicomStudyFileView>> GetVisitNoneDicomStudyFileList(Guid subjectVisitId);
         Task<IResponseOutput> 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<List<NoneDicomStudyView>> GetNoneDicomStudyList(Guid subjectVisitId)
+        [HttpGet]
+        public async Task<List<NoneDicomStudyView>> 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<NoneDicomStudyView>(_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<List<NoneDicomStudyFileView>> GetVisitNoneDicomStudyFileList(Guid subjectVisitId)
         {
-            return await _repository.Where<NoneDicomStudyFile>(t => t.NoneDicomStudy.SubjectVisitId == subjectVisitId).ProjectTo<NoneDicomStudyFileView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken }).ToListAsync();
+            return await _repository.Where<NoneDicomStudyFile>(t => t.NoneDicomStudy.SubjectVisitId == subjectVisitId)
+                .ProjectTo<NoneDicomStudyFileView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken }).ToListAsync();
         }