Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

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

@@ -220,6 +220,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         public int FailedFileCount { get; set; }
 
+        public string RecordPath { get; set; }
+
         public AddOrUpdateStudyDto Study { get; set; }
     
 

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

@@ -151,7 +151,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 studyMonitor.UploadFinishedTime = DateTime.Now;
                 studyMonitor.ArchiveFinishedTime = DateTime.Now;
                 studyMonitor.FailedFileCount = incommand.FailedFileCount;
-                studyMonitor.IsSuccess = true;
+                studyMonitor.IsSuccess = incommand.FailedFileCount==0;
+                studyMonitor.RecordPath=incommand.RecordPath;
 
                 //上传
                 if (studyMonitor.IsDicomReUpload == false)
@@ -209,6 +210,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                         series.SubjectId = incommand.SubjectId;
                         series.SubjectVisitId = incommand.SubjectVisitId;
 
+                        //前端传递的数量不准，上传的时候，把失败的也加进来了，以实际数组的数字为准
+                        series.InstanceCount = seriesItem.InstanceList.Count;
+
                         await _dicomSeriesRepository.AddAsync(series);
 
                         foreach (var instanceItem in seriesItem.InstanceList)

IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs

@@ -87,6 +87,8 @@ namespace IRaCIS.Core.Domain.Models
 
         public string Note = string.Empty;
 
+        public string RecordPath { get; set; }=string.Empty;
+
     }
 
 }