非dicom 检查列表返回文件信息，同时增加IR 上传文件绑定

IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

@@ -38,6 +38,7 @@ using Newtonsoft.Json;
 using SharpCompress.Archives;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Data;
 using System.Globalization;
 using System.IO;
@@ -419,12 +420,20 @@ namespace IRaCIS.Core.API.Controllers
 
         public class UploadNoneDicomFileCommand
         {
-            public Guid TrialId { get; set; }
+            [NotDefault]
             public Guid SubjectVisitId { get; set; }
-            public Guid NoneDicomStudyId { get; set; }
+
+
+            [NotDefault] 
             public Guid StudyMonitorId { get; set; }
 
 
+            public Guid? NoneDicomStudyId { get; set; }
+
+            //IR 上传的时候跟任务绑定
+            public Guid? VisitTaskId { get; set; }
+
+
             public List<OSSFileDTO> UploadedFileList { get; set; } = new List<OSSFileDTO>();
 
 
@@ -470,7 +479,19 @@ namespace IRaCIS.Core.API.Controllers
 
             foreach (var item in incommand.UploadedFileList)
             {
-                await _noneDicomStudyFileRepository.AddAsync(new NoneDicomStudyFile() { FileName = item.FileName, Path = item.FilePath, NoneDicomStudyId = noneDicomStudyId,FileType=item.FileType,FileSize=item.FileFize });
+                //如果是跟任务绑，那么NoneDicomStudyId 设置为空，不影响之前的检查，同时设置 OriginNoneDicomStudyId 保证关系
+
+                if(incommand.VisitTaskId!=null && incommand.VisitTaskId !=Guid.Empty)
+                {
+                    await _noneDicomStudyFileRepository.AddAsync(new NoneDicomStudyFile() { FileName = item.FileName, Path = item.FilePath, OriginNoneDicomStudyId=noneDicomStudyId.Value, FileType = item.FileType, FileSize = item.FileFize });
+
+                }
+                else
+                {
+                    await _noneDicomStudyFileRepository.AddAsync(new NoneDicomStudyFile() { FileName = item.FileName, Path = item.FilePath, NoneDicomStudyId = noneDicomStudyId.Value, FileType = item.FileType, FileSize = item.FileFize });
+
+                }
+
 
             }
             var uploadFinishedTime = DateTime.Now;
@@ -483,7 +504,7 @@ namespace IRaCIS.Core.API.Controllers
             studyMonitor.FileSize = incommand.UploadedFileList.Sum(t => t.FileFize);
             studyMonitor.IsDicom = false;
             studyMonitor.IsDicomReUpload = false;
-            studyMonitor.StudyId = noneDicomStudyId;
+            studyMonitor.StudyId = noneDicomStudyId.Value;
             studyMonitor.StudyCode = noneDicomStudy.StudyCode;
             studyMonitor.ArchiveFinishedTime = DateTime.Now;
             studyMonitor.IP = _userInfo.IP;