From cde58ace66871ae38c7e671cdd50ddd43a723f88 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 11 May 2023 15:22:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BA=9F=E5=BC=83?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/QC/QCOperationService.cs | 35 ++----------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index 62e0cf191..f654d9beb 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -790,24 +790,7 @@ namespace IRaCIS.Core.Application.Image.QA await _dicomStudyRepository.DeleteAsync(study); - - //var DicomSeriess = await _repository.GetQueryable().Where(t => t.StudyId == id).Select(x => new - //{ - // x.StudyId, - // x.SubjectId, - // x.SiteId, - // x.TrialId, - // x.Id, - // x.SubjectVisitId, - // x.SeriesTime, - // x.IsReading, - // x.InstanceCount, - // x.SeriesNumber, - // StudyCode = x.DicomStudy.StudyCode, - // Modalities = x.DicomStudy.Modalities, - - //}).ToListAsync(); - + var succeess2 = await _repository.BatchDeleteAsync(t => t.StudyId == id); var success3 = await _dicomSeriesrepository.BatchDeleteNoTrackingAsync(t => t.StudyId == id); @@ -830,21 +813,7 @@ namespace IRaCIS.Core.Application.Image.QA } }); - //var instanceIdList = await _repository.Where(t => t.StudyId == id) - // .Select(t => new { InstanceId = t.Id, t.SeriesId, t.StudyId, t.SubjectId, t.SiteId }).ToListAsync(); - - //instanceIdList.ForEach(t => - //{ - // var dicomStudy = new DicomStudy() { Id = t.StudyId, SubjectId = t.SubjectId, TrialId = trialId, SiteId = t.SiteId, SubjectVisitId = subjectVisitId }; - // var (physicalPath, relativePath) = - // FileStoreHelper.GetDicomInstanceFilePath(_hostEnvironment, dicomStudy.TrialId, dicomStudy.SiteId, dicomStudy.SubjectId, dicomStudy.SubjectVisitId, dicomStudy.Id, t.InstanceId); - - // if (System.IO.File.Exists(physicalPath)) - // { - // File.Delete(physicalPath); - // } - - //}); + } await _subjectVisitRepository.SaveChangesAsync(); From a0747230ac8874763cda3a4e8e2c193d0afa783b Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 15 May 2023 10:08:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=8F=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs | 1 + IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs | 3 ++- IRaCIS.Core.Domain/Image/DicomSeries.cs | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs index ae3b4fa9b..86033717f 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs @@ -278,6 +278,7 @@ namespace IRaCIS.Core.Application.Contracts public string AcquisitionNumber { get; set; } = string.Empty; public string TriggerTime { get; set; } = string.Empty; + public string IamgeResizePath { get; set; } public List InstanceList { get; set; } diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs index 8afc1d48d..f75eceb3a 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs @@ -256,9 +256,10 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc else { //该序列掉了instance - dicomSeries.InstanceCount += seriesItem.InstanceCount; + dicomSeries.InstanceCount += seriesItem.InstanceCount; } + dicomSeries.IamgeResizePath = seriesItem.IamgeResizePath; foreach (var instanceItem in seriesItem.InstanceList) { diff --git a/IRaCIS.Core.Domain/Image/DicomSeries.cs b/IRaCIS.Core.Domain/Image/DicomSeries.cs index 1e4be2b3c..c7f0b2e13 100644 --- a/IRaCIS.Core.Domain/Image/DicomSeries.cs +++ b/IRaCIS.Core.Domain/Image/DicomSeries.cs @@ -61,5 +61,7 @@ namespace IRaCIS.Core.Domain.Models public bool IsDeleted {get;set;} public bool IsReading { get; set; } = true; + public string IamgeResizePath { get; set; } + } }