修改上传监控

IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

@@ -407,6 +407,12 @@ namespace IRaCIS.Core.API.Controllers
             //IR 上传的时候跟任务绑定
             public Guid? VisitTaskId { get; set; }
 
+            public string RecordPath { get; set; }
+
+            public int FailedFileCount { get; set; }
+
+            public long FileSize { get; set; }
+
 
             public List<OSSFileDTO> UploadedFileList { get; set; } = new List<OSSFileDTO>();
 
@@ -420,6 +426,14 @@ namespace IRaCIS.Core.API.Controllers
                 public string FileType { get; set; }
             }
         }
+
+        /// <summary>
+        /// 非dicom 上传预上传接口
+        /// </summary>
+        /// <param name="preArchiveStudyCommand"></param>
+        /// <param name="_studyService"></param>
+        /// <param name="_studyMonitorRepository"></param>
+        /// <returns></returns>
         [HttpPost, Route("Study/PreArchiveStudy")]
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> PreArchiveStudy(PreArchiveStudyCommand preArchiveStudyCommand,
@@ -437,6 +451,7 @@ namespace IRaCIS.Core.API.Controllers
 
                 IsSuccess = false,
                 UploadStartTime = DateTime.Now,
+                FileCount=preArchiveStudyCommand.FileCount,
                 IsDicom = preArchiveStudyCommand.IsDicom,
                 IP = _userInfo.IP
             };
@@ -500,7 +515,9 @@ namespace IRaCIS.Core.API.Controllers
 
             noneDicomStudy.FileCount = noneDicomStudy.FileCount + (incommand.VisitTaskId != null ? 0 : incommand.UploadedFileList.Count);
 
-            studyMonitor.FileCount = incommand.UploadedFileList.Count;
+            studyMonitor.RecordPath = incommand.RecordPath;
+            studyMonitor.FailedFileCount = incommand.FailedFileCount;
+            studyMonitor.IsSuccess = incommand.FailedFileCount == 0;
             studyMonitor.FileSize = incommand.UploadedFileList.Sum(t => t.FileFize);
             studyMonitor.IsDicom = false;
             studyMonitor.IsDicomReUpload = false;
@@ -508,7 +525,6 @@ namespace IRaCIS.Core.API.Controllers
             studyMonitor.StudyCode = noneDicomStudy.StudyCode;
             studyMonitor.ArchiveFinishedTime = DateTime.Now;
             studyMonitor.IP = _userInfo.IP;
-            studyMonitor.IsSuccess = true;
 
             await _noneDicomStudyRepository.SaveChangesAsync();