From af983c6bcec77b4f61498171822e988049fc59aa Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 21 Apr 2022 11:52:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/QC/NoneDicomStudyService.cs       |  3 ++-
 .../Service/QC/QCOperationService.cs          | 22 +++++++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs
index 625a9663..e76e0651 100644
--- a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs
+++ b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs
@@ -66,7 +66,8 @@ namespace IRaCIS.Core.Application.Contracts
             {
                 if (addOrEditNoneDicomStudy.Id == Guid.Empty|| addOrEditNoneDicomStudy.Id==null)
                 {
-                    addOrEditNoneDicomStudy.Code =(await _noneDicomStudyRepository.Where(t => t.TrialId == addOrEditNoneDicomStudy.TrialId).MaxAsync(x=>x.Code)) + 1;
+                    var code =  _noneDicomStudyRepository.Where(t => t.TrialId == addOrEditNoneDicomStudy.TrialId).MaxOrDefault(x=>x.Code);
+                    addOrEditNoneDicomStudy.Code = code + 1;
                 }
 
                 addOrEditNoneDicomStudy.Code = addOrEditNoneDicomStudy.Code ?? 0;
diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
index 85758035..50306bdb 100644
--- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
+++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
@@ -1475,11 +1475,20 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <param name="signId"></param>
         /// <param name="auditState"></param>
         /// <returns></returns>
-        [HttpPost("{trialId:guid}/{subjectVisitId:guid}/{signId:guid}/{auditState:int}")]
+        [HttpPost("{trialId:guid}/{subjectVisitId:guid}/{auditState:int}")]
 
         [TypeFilter(typeof(TrialResourceFilter))]
         public async Task<IResponseOutput> QCPassedOrFailed(Guid trialId, Guid subjectVisitId, [FromRoute] AuditStateEnum auditState)
         {
+            var DicomSeriesdatac = await _repository.GetQueryable<DicomSeries>().Where(x => x.SubjectVisitId == subjectVisitId).Select(x => new {
+                StudyCode = x.DicomStudy.StudyCode,
+                Modalities = x.DicomStudy.Modalities,
+                SeriesNumber = x.SeriesNumber,
+                InstanceCount = x.InstanceCount,
+                SeriesTime = x.SeriesTime,
+                IsReading = x.IsReading,
+                IsDeleted = x.IsDeleted,
+            }).ToListAsync();
 
             if (!await _repository.AnyAsync<TrialUser>(t => t.TrialId == trialId && t.UserId == _userInfo.Id))
             {
@@ -1625,7 +1634,16 @@ namespace IRaCIS.Core.Application.Image.QA
             var instanceIdList = await _repository.Where<DicomInstance>(t => t.DicomSerie.IsDeleted && t.SubjectVisitId == subjectVisitId)
                 .Select(t => new { InstanceId = t.Id, t.SeriesId, t.StudyId, t.SubjectId, t.SiteId }).ToListAsync();
 
-
+            List<DataInspection> datas = new List<DataInspection>();
+            var DicomSeriesdata = await _repository.GetQueryable<DicomSeries>().Where(x=>x.SubjectVisitId== subjectVisitId&&x.IsDeleted).Select(x => new {
+                StudyCode=x.DicomStudy.Code,
+                Modalities=x.DicomStudy.Modalities,
+                SeriesNumber=x.SeriesNumber,
+                InstanceCount=x.InstanceCount,
+                SeriesTime=x.SeriesTime,
+                IsReading=x.IsReading,
+                IsDeleted=x.IsDeleted,
+            }).ToListAsync();
 
             instanceIdList.ForEach(t =>
             {