质控返回是否匿名标记字段,撤销

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

@@ -102,6 +102,8 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO
 
         public Guid? SeriesId { get; set; }
 
+        public bool? IsMasked { get; set; }
+
         [JsonIgnore]
         public int ShowOrder { get; set; }
         [JsonIgnore]

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

@@ -72,7 +72,8 @@ namespace IRaCIS.Core.Application.Services
                            InstanceNumber = k.InstanceNumber,
                            IsReading = true,
                            IsDeleted = false,
-                           FileSize = k.FileSize
+                           FileSize = k.FileSize,
+                           
 
                        }).ToList();
 
@@ -103,7 +104,7 @@ namespace IRaCIS.Core.Application.Services
                      .WhereIf(isReading == true, t => t.IsReading == true)
                      .OrderBy(t => t.SeriesId).ThenBy(t => t.InstanceNumber)
                      .ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime)
-                    .Select(t => new { t.SeriesId, t.Id, t.Path, t.NumberOfFrames, t.InstanceNumber, t.HtmlPath, t.IsReading, t.IsDeleted, t.FileSize }).ToListAsync();//.GroupBy(u => u.SeriesId);
+                    .Select(t => new { t.SeriesId, t.Id, t.Path, t.NumberOfFrames, t.InstanceNumber, t.HtmlPath, t.IsReading, t.IsDeleted, t.FileSize ,t.IsMasked}).ToListAsync();//.GroupBy(u => u.SeriesId);
 
 
                 foreach (var series in seriesList)
@@ -119,7 +120,8 @@ namespace IRaCIS.Core.Application.Services
                            InstanceNumber = k.InstanceNumber,
                            IsReading = k.IsReading,
                            IsDeleted = k.IsDeleted,
-                           FileSize = k.FileSize
+                           FileSize = k.FileSize,
+                           IsMasked = k.IsMasked
 
                        }).ToList();
 

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

@@ -106,16 +106,16 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                     var prefix = path.Substring(1, path.LastIndexOf('/') - 1);
 
-                    var maskPath = $"{Path.GetFileName(path)}.MaskDicom";
+                    var maskPath = path.Contains(".MaskDicom") ? $"{Path.GetFileName(path)}" : $"{Path.GetFileName(path)}.MaskDicom";
 
                     //清理缓存的里面的遮盖图，多次遮盖同一张图时，清除缓存很重要
                     await _oSSService.DeleteFromPrefix(maskPath, true);
 
-                var tt  =  await _oSSService.UploadToOSSAsync(outPutStream, prefix, maskPath,false);
+                    await _oSSService.UploadToOSSAsync(outPutStream, prefix, maskPath, false);
 
-                    var newPath = path + ".MaskDicom";
+                    var newPath = path.Contains(".MaskDicom") ? path : path + ".MaskDicom";
 
-                    await _dicomInstanceRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Id, u => new DicomInstance() { Path= newPath, IsMasked = true });
+                    await _dicomInstanceRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Id, u => new DicomInstance() { Path = newPath, IsMasked = true });
                 }
                 catch (Exception ex)
                 {
@@ -188,7 +188,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         public async Task<PatientInfoDto> GetPatientInfo(GetPatientInfoInDto inDto)
         {
             var study = await _dicomStudyRepository.Where(s => s.Id == inDto.StudyId).ProjectTo<PatientInfoDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
-            
+
             return study;
         }