修改上传

IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

@@ -138,9 +138,6 @@ namespace IRaCIS.Core.API.Controllers
 
              var fileCount = 0;
 
-            //var boundary = HeaderUtilities.RemoveQuotes(MediaTypeHeaderValue.Parse(Request.ContentType).Boundary).Value;
-            //var boundary = mediaTypeHeader.Boundary.Value;
-
                 var reader = new MultipartReader(boundary, HttpContext.Request.Body);
 
                 var section = await reader.ReadNextSectionAsync();
@@ -187,6 +184,8 @@ namespace IRaCIS.Core.API.Controllers
                     section = await reader.ReadNextSectionAsync();
                 }
      
+
+
         }
 
 
@@ -240,9 +239,6 @@ namespace IRaCIS.Core.API.Controllers
 
             //_logger.LogError("请求到达接口");
 
-            // validation of Content-Type
-            // 1. first, it must be a form-data request
-            // 2. a boundary should be found in the Content-Type
             if (!HttpContext.Request.HasFormContentType ||
                 !MediaTypeHeaderValue.TryParse(HttpContext.Request.ContentType, out var mediaTypeHeader) ||
                 string.IsNullOrEmpty(mediaTypeHeader.Boundary.Value))
@@ -257,13 +253,13 @@ namespace IRaCIS.Core.API.Controllers
 
             var startTime = DateTime.Now;
 
-            if (_provider.Exists("StudyUid_" + archiveStudyCommand.StudyInstanceUid))
+            if (_provider.Exists($"StudyUid_{trialId}_{archiveStudyCommand.StudyInstanceUid}" ))
             {
                 return ResponseOutput.NotOk("当前已有人正在上传和归档该检查!");
             }
             else
             {
-                _provider.Set("StudyUid_" + archiveStudyCommand.StudyInstanceUid, _userInfo.Id, TimeSpan.FromMinutes(30));
+                _provider.Set($"StudyUid_{trialId}_{archiveStudyCommand.StudyInstanceUid}", _userInfo.Id, TimeSpan.FromMinutes(30));
             }
 
             var (archiveResult, archivedStudyIds) = (new DicomArchiveResult(), new List<Guid>());
@@ -279,6 +275,9 @@ namespace IRaCIS.Core.API.Controllers
 
             var savedInfo = _studyService.GetSaveToDicomInfo(archiveStudyCommand.SubjectVisitId);
 
+            try
+            {
+
                 await DicomFileUploadAsync(async (fileName, fileStream, receivedCount) =>
                 {
 
@@ -316,6 +315,16 @@ namespace IRaCIS.Core.API.Controllers
 
                 }, mediaTypeHeader.Boundary.Value);
 
+
+            }
+            catch (Exception ex)
+            {
+                _provider.Remove($"StudyUid_{trialId}_{archiveStudyCommand.StudyInstanceUid}");
+
+                throw new BusinessValidationFailedException("请求异常,请重试！");
+            }
+
+
             var studyMonitor = new StudyMonitor()
             {
                 TrialId = savedInfo.TrialId,
@@ -336,7 +345,6 @@ namespace IRaCIS.Core.API.Controllers
             try
             {
 
-
                 if (archivedStudyIds.Count > 0) // 上传成功，处理逻辑
                 {
 
@@ -346,7 +354,6 @@ namespace IRaCIS.Core.API.Controllers
 
                     archiveResult.ReuploadNewStudyId = archivedStudyIds[0] == archiveStudyCommand.AbandonStudyId ? archivedStudyIds[0] : Guid.Empty;
 
-
                     studyMonitor.IsSuccess = true;
 
                 }
@@ -354,8 +361,6 @@ namespace IRaCIS.Core.API.Controllers
                 {
                     studyMonitor.IsSuccess = false;
                     studyMonitor.Note = JsonConvert.SerializeObject(archiveResult);                 
-                    _provider.Remove("StudyUid_" + archiveStudyCommand.StudyInstanceUid);
-
                 }
 
 
@@ -372,7 +377,7 @@ namespace IRaCIS.Core.API.Controllers
             }
             finally
             {
-                _provider.Remove("StudyUid_" + archiveStudyCommand.StudyInstanceUid);
+                _provider.Remove($"StudyUid_{trialId}_{archiveStudyCommand.StudyInstanceUid}");
 
                 studyMonitor.StudyId = archiveResult.ArchivedDicomStudies.FirstOrDefault()?.Id ?? Guid.Empty;
                 studyMonitor.StudyCode = archiveResult.ArchivedDicomStudies.FirstOrDefault()?.StudyCode;

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

@@ -23,6 +23,9 @@ namespace IRaCIS.Core.Application.Services
 
         private static object lockCodeGenerate = new object();
 
+
+        private List<Guid> _instanceIdList = new List<Guid>();
+
         public DicomArchiveService(IRepository<DicomStudy> studyRepository,
             IRepository<DicomSeries> seriesRepository,
             IRepository<DicomInstance> instanceRepository,
@@ -122,7 +125,7 @@ namespace IRaCIS.Core.Application.Services
 
             DicomStudy dicomStudy = CreateDicomStudy(dataset, addtionalInfo, out bool isStudyNeedAdd);
             DicomSeries dicomSeries = CreateDicomSeries(dataset, dicomStudy, out bool isSeriesNeedAdd);
-            DicomInstance dicomInstance = CreateDicomInstance(dataset, dicomStudy, dicomSeries);
+            DicomInstance dicomInstance = CreateDicomInstance(dataset, dicomStudy, dicomSeries,out bool isInstanceNeedAdd);
 
             dicomSeries.DicomStudy = dicomStudy;
 
@@ -147,8 +150,12 @@ namespace IRaCIS.Core.Application.Services
 
             dicomInstance.Path = relativePath;
 
+            if (isInstanceNeedAdd)
+            {
                 await _instanceRepository.AddAsync(dicomInstance);
 
+            }
+
 
             var samplesPerPixel = dataset.GetSingleValueOrDefault(DicomTag.SamplesPerPixel, string.Empty);
             var photometricInterpretation = dataset.GetSingleValueOrDefault(DicomTag.PhotometricInterpretation, string.Empty);
@@ -379,11 +386,14 @@ namespace IRaCIS.Core.Application.Services
 
         }
 
-        private DicomInstance CreateDicomInstance(DicomDataset dataset, DicomStudy dicomStudy, DicomSeries dicomSeries)
+        private DicomInstance CreateDicomInstance(DicomDataset dataset, DicomStudy dicomStudy, DicomSeries dicomSeries, out bool isInstanceNeedAdd)
         {
             string sopInstanceUid = dataset.GetString(DicomTag.SOPInstanceUID);
             Guid instanceId = IdentifierHelper.CreateGuid(dicomStudy.StudyInstanceUid, dicomSeries.SeriesInstanceUid, sopInstanceUid, dicomStudy.TrialId.ToString());
 
+
+
+
             DicomInstance dicomInstance = new DicomInstance
             {
                 Id = instanceId,
@@ -417,13 +427,20 @@ namespace IRaCIS.Core.Application.Services
                 WindowWidth = dataset.GetSingleValueOrDefault(DicomTag.WindowWidth, string.Empty),
             };
 
+            isInstanceNeedAdd = false;
+
+            if (!_instanceIdList.Contains(instanceId))
+            {
                 ++dicomStudy.InstanceCount;
                 ++dicomSeries.InstanceCount;
 
+                isInstanceNeedAdd = true;
+
+                _instanceIdList.Add(instanceId);
+            }
+       
             return dicomInstance;
 
-
-
         }
 
 

IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs

@@ -456,7 +456,7 @@ namespace IRaCIS.Core.Application.Contracts
         [HttpGet("{trialId:guid}")]
         public async Task<TrialSurveyInitInfo> GetTrialSurveyInitInfo(Guid trialId)
         {
-            var info = await _repository.Where<Trial>(t => t.Id == trialId)/*.IgnoreQueryFilters()*/.ProjectTo<TrialSurveyInitInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync().IfNullThrowException();
+            var info = await _repository.Where<Trial>(t => t.Id == trialId).IgnoreQueryFilters().ProjectTo<TrialSurveyInitInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync().IfNullThrowException();
 
             return info;
         }