diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 4d512ba92..f66b0253a 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -2960,11 +2960,11 @@ - + 影像下载成功回调 - + diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs index 0b71bd459..c57918cb4 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs @@ -1373,7 +1373,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc VisitName = item.VisitName, //取dicom - DicomStudyList = item.DicomStudyList, + DicomStudyList = item.DicomStudyList.Where(t => t.ReadingSeriesCount > 0).ToList(), }).ToList(); var noneStudyList = list.Where(item => item.NoneDicomStudyList.Count > 0) @@ -1386,12 +1386,12 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc VisitName = item.VisitName, //非dicom - NoneDicomStudyList = item.NoneDicomStudyList, + NoneDicomStudyList = item.NoneDicomStudyList.Where(t => t.ReadingFileCount > 0).ToList(), }).ToList(); - result.AddRange(dicomStudyList); - result.AddRange(noneStudyList); + result.AddRange(dicomStudyList.Where(t => t.DicomStudyList.Count > 0)); + result.AddRange(noneStudyList.Where(t => t.NoneDicomStudyList.Count > 0)); #endregion return ResponseOutput.Ok(result); @@ -1492,7 +1492,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc CriterionModalitys = item.CriterionModalitys, SourceSubjectVisitId = item.SourceSubjectVisitId, //取dicom - DicomStudyList = item.DicomStudyList, + DicomStudyList = item.DicomStudyList.Where(t => t.ReadingSeriesCount > 0).ToList(), }).ToList(); var noneStudyList = list.Where(item => item.NoneDicomStudyList.Count > 0) @@ -1507,12 +1507,12 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc CriterionModalitys = item.CriterionModalitys, SourceSubjectVisitId = item.SourceSubjectVisitId, //非dicom - NoneDicomStudyList = item.NoneDicomStudyList, + NoneDicomStudyList = item.NoneDicomStudyList.Where(t => t.ReadingFileCount > 0).ToList() }).ToList(); - result.AddRange(dicomStudyList); - result.AddRange(noneStudyList); + result.AddRange(dicomStudyList.Where(t => t.DicomStudyList.Count > 0)); + result.AddRange(noneStudyList.Where(t => t.NoneDicomStudyList.Count > 0)); #endregion