增加新的影像归档检查表

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

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web;
+
+namespace IRaCIS.Core.Application.Service.ImageAndDoc.DTO
+{
+    public class SubjectImageUploadDTO
+    {
+        public Guid SubejctId { get; set; }
+
+        public string SubjectCode { get; set; }
+
+        public string TaskBlindName { get; set; }
+
+        public string TaskName { get; set; }
+
+        public List<StudyBasicInfo> OrginalStudyList { get; set; }
+
+        public List<StudyBasicInfo> UploadStudyList { get; set; }
+
+    }
+
+    public class StudyBasicInfo
+    {
+        public Guid Id { get; set; }
+
+        public string Modalities { get; set; }
+
+        public string Description { get; set; } 
+        public int SeriesCount { get; set; } 
+        public int InstanceCount { get; set; } 
+    }
+}
+

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

@@ -1,5 +1,6 @@
 using FellowOakDicom;
 using IRaCIS.Core.Application.Helper;
+using IRaCIS.Core.Application.Service.ImageAndDoc.DTO;
 using MassTransit;
 using Microsoft.AspNetCore.Mvc;
 using System;
@@ -31,6 +32,44 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             _oSSService = oSSService;
         }
 
+        /// <summary>
+        /// 获取该受试者任务上传列表（展示已上传情况）
+        /// </summary>
+        /// <param name="subjectId"></param>
+        /// <returns></returns>
+        public async Task<IResponseOutput<List<SubjectImageUploadDTO> >> GetSubjectImageUploadList(Guid subjectId)
+        {
+            var query=_repository.Where<VisitTask>(t=>t.Id==subjectId)
+                .Select(u=>new SubjectImageUploadDTO()
+                {
+                    SubejctId=u.SubjectId,
+                    SubjectCode=u.IsSelfAnalysis==true?  u.Subject.Code:u.BlindSubjectCode,
+                    TaskBlindName=u.TaskBlindName,
+                    TaskName=u.TaskName,
+                    OrginalStudyList=u.SourceSubjectVisit.StudyList.Select(t=>new StudyBasicInfo()
+                    {
+                        Id=t.Id,
+                        Description=t.Description,
+                        InstanceCount=t.InstanceCount,
+                        Modalities=t.Modalities,
+                        SeriesCount=t.SeriesCount,
+                    }).ToList(),
+
+                    UploadStudyList=u.TaskStudyList.Select(t => new StudyBasicInfo()
+                    {
+                        Id = t.Id,
+                        Description = t.Description,
+                        InstanceCount = t.InstanceCount,
+                        Modalities = t.Modalities,
+                        SeriesCount = t.SeriesCount,
+                    }).ToList()
+                })
+                ;
+
+            var list =await query.ToListAsync();
+
+            return ResponseOutput.Ok(list);
+        }
 
         /// <summary>
         /// 打包和匿名化影像 默认是匿名化打包，也可以不匿名化打包

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

@@ -139,11 +139,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         }
 
 
-        /// <summary>
-        /// 上传临床数据
-        /// </summary>
-        /// <param name="incommand"></param>
-        /// <returns></returns>
+
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> AddOrUpdateArchiveStudy(NewArchiveStudyCommand incommand)
         {