Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs

@@ -46,7 +46,7 @@ namespace IRaCIS.Core.Application.Contracts
         public bool IsDicom { get; set; }
 
 
-        
+
     }
 
     public class UnionStudyMonitorModel : UnionStudyBaseModel
@@ -363,4 +363,21 @@ namespace IRaCIS.Core.Application.Contracts
 
         public decimal FileFize { get; set; }
     }
+
+    public class CRCUploadedStudyQuqry
+    {
+        [NotDefault]
+        public Guid SubjectVisitId { get; set; }
+
+        public List<Guid> DicomStudyIdList { get; set; }
+
+        public List<Guid> NoneDicomStudyIdList { get; set; }
+    }
+
+    public class IRReadingDownloadQuery
+    {
+        [NotDefault]
+        public Guid VisitTaskId { get; set; }
+
+    }
 }

IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs

@@ -45,7 +45,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
         IDistributedLockProvider _distributedLockProvider) : BaseService, IDownloadAndUploadService
     {
-     
+
 
         /// <summary>
         /// 受试者随机阅片，任务进行随机编号
@@ -490,7 +490,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         {
 
 
-            var extralConfig =  _trialRepository.Where(t => t.Id == trialId).Select(t => t.TrialExtraConfigJsonStr).FirstOrDefault() ?? string.Empty;
+            var extralConfig = _trialRepository.Where(t => t.Id == trialId).Select(t => t.TrialExtraConfigJsonStr).FirstOrDefault() ?? string.Empty;
 
             var config = JsonConvert.DeserializeObject<TrialExtraConfig>(extralConfig) ?? new TrialExtraConfig();
 
@@ -608,7 +608,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             }
             else if (inQuery.SubejctId != null)
             {
-                var query = from sv in _subjectRepository.Where(t => t.Id == inQuery.SubejctId).SelectMany(t=>t.SubjectVisitList)
+                var query = from sv in _subjectRepository.Where(t => t.Id == inQuery.SubejctId).SelectMany(t => t.SubjectVisitList)
 
 
                             select new
@@ -656,7 +656,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             }
             else
             {
-                return ResponseOutput.NotOk("不允许 subjectId  subjectId 都不传递");
+                return ResponseOutput.NotOk("不允许 subjectId  SubejectVisitId 都不传递");
             }
 
 
@@ -894,5 +894,140 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
         }
 
+
+        /// <summary>
+        /// IQC  获取CRC 上传到某一个访视的的检查信息 (原始影像信息  包含dicom  非dicom)
+        /// </summary>
+        /// <param name="inQuery"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IResponseOutput> GetCRCUploadedStudyInfo(CRCUploadedStudyQuqry inQuery)
+        {
+            var isQueryDicom = inQuery.DicomStudyIdList.Count > 0;
+            var isQueryNoneDicom = inQuery.NoneDicomStudyIdList.Count > 0;
+
+            var query = from sv in _subjectVisitRepository.Where(t => t.Id == inQuery.SubjectVisitId)
+
+
+                        select new
+                        {
+                            SubjectCode = sv.Subject.Code,
+                            VisitName = sv.VisitName,
+
+                            StudyList = sv.StudyList.Where(t => isQueryDicom ? inQuery.DicomStudyIdList.Contains(t.Id):false)
+                                                                  
+                            .Select(u => new
+                            {
+                                u.PatientId,
+                                u.StudyTime,
+                                u.StudyCode,
+
+                                SeriesList = u.SeriesList.Select(z => new
+                                {
+                                    z.Modality,
+
+                                    InstanceList = z.DicomInstanceList.Select(k => new
+                                    {
+                                        k.Path,
+                                        k.FileSize
+                                    })
+                                })
+
+                            }).ToList(),
+
+                            NoneDicomStudyList = sv.NoneDicomStudyList.Where( t => isQueryNoneDicom?inQuery.NoneDicomStudyIdList.Contains(t.Id):false)
+                                                                                    
+                            .Select(nd => new
+                            {
+                                nd.Modality,
+                                nd.StudyCode,
+                                nd.ImageDate,
+
+                                FileList = nd.NoneDicomFileList.Select(file => new
+                                {
+                                    file.FileName,
+                                    file.Path,
+                                    file.FileType
+                                })
+                            }).ToList()
+                        };
+
+            var result = query.ToList();
+
+            return ResponseOutput.Ok(result);
+        }
+
+
+        /// <summary>
+        /// IR 阅片页面获取下载检查的信息  会根据标准进行过滤检查，（后端要考虑到一致性分析 subjectCode的问题）
+        /// </summary>
+        /// <param name="inQuery"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IResponseOutput> GetIRReadingDownloadStudyInfo(IRReadingDownloadQuery inQuery)
+        {
+            var taskInfo = await _visitTaskRepository.Where(t => t.Id == inQuery.VisitTaskId)
+                  .Select(t => new
+                  {
+                      t.BlindSubjectCode,
+                      t.IsAnalysisCreate,
+                      t.SourceSubjectVisitId,
+                      t.TrialReadingCriterion.IsImageFilter,
+                      t.TrialReadingCriterion.CriterionModalitys
+                  })
+                  .FirstNotNullAsync();
+
+            if (taskInfo.SourceSubjectVisitId == null)
+            {
+                return ResponseOutput.NotOk("请开发核实传递的参数，该查询任务关联访视Id没有值");
+            }
+
+            var query = from sv in _subjectVisitRepository.Where(t => t.Id == taskInfo.SourceSubjectVisitId)
+
+
+                        select new
+                        {
+                            SubjectCode = sv.Subject.Code,
+                            VisitName = sv.VisitName,
+                            StudyList = sv.StudyList.AsQueryable().WhereIf(taskInfo.IsImageFilter, t => ("|" + taskInfo.CriterionModalitys + "|").Contains("|" + t.ModalityForEdit + "|"))
+                            .Select(u => new
+                            {
+                                u.PatientId,
+                                u.StudyTime,
+                                u.StudyCode,
+
+                                SeriesList = u.SeriesList.Select(z => new
+                                {
+                                    z.Modality,
+
+                                    InstancePathList = z.DicomInstanceList.Select(k => new
+                                    {
+                                        k.Path
+                                    })
+                                })
+
+                            }),
+
+                            NoneDicomStudyList = sv.NoneDicomStudyList.AsQueryable().WhereIf(taskInfo.IsImageFilter, t => ("|" + taskInfo.CriterionModalitys + "|").Contains("|" + t.Modality + "|"))
+                            .Select(nd => new
+                            {
+                                nd.Modality,
+                                nd.StudyCode,
+                                nd.ImageDate,
+
+                                FileList = nd.NoneDicomFileList.Select(file => new
+                                {
+                                    file.FileName,
+                                    file.Path,
+                                    file.FileType
+                                })
+                            })
+                        };
+
+            return ResponseOutput.Ok();
+        }
+
     }
+
+
 }