Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

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

@@ -117,4 +117,10 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO
         public bool HasLabel { get; set; } = false;
         public bool KeySeries { get; set; } = false;
     }
+    public class UpdateImageResizeDTO
+    {
+        public Guid SeriesId { get; set; }  
+
+        public string ImageResizePath { get; set; }
+    }
 }

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

@@ -134,6 +134,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string Bodypart { get; set; } = string.Empty;
 
+        public string BodyPartForEditOther { get; set; } = string.Empty;
+
         public DateTime? StudyTime { get; set; }
 
 

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

@@ -1185,6 +1185,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                 foreach (var item in list.GroupBy(t => new { t.StudyInstanceUid, t.DicomStudyId }))
                 {
+
+                    var studyUid = item.Key.StudyInstanceUid;
+
                     var ossFolder = $"{pathInfo.TrialId}/Image/{pathInfo.SubjectId}/{pathInfo.VisitId}/{item.Key.StudyInstanceUid}";
 
                     var isSucess = await SafeBussinessHelper.RunAsync(async () => await DicomDIRHelper.GenerateStudyDIRAndUploadAsync(item.ToList(), dirDic, ossFolder, _oSSService));
@@ -1192,7 +1195,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                     if (isSucess)
                     {
-                        await _dicomStudyRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Key.DicomStudyId, u => new DicomStudy() { StudyDIRPath = $"/{ossFolder}/DICOMDIR" });
+                        await _dicomStudyRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Key.DicomStudyId, u => new DicomStudy() { StudyDIRPath = $"/{ossFolder}/{dirDic[$"{studyUid}_DICOMDIR"]}" });
                     }
 
                 }
@@ -1625,6 +1628,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                     var ossFolder = $"{pathInfo.TrialId}/Image/{pathInfo.SubjectId}/{visitId}/{item.Key.StudyInstanceUid}";
 
+                    var studyUid = item.Key.StudyInstanceUid;
+
                     var isSucess = await SafeBussinessHelper.RunAsync(async () => await DicomDIRHelper.GenerateStudyDIRAndUploadAsync(item.ToList(), dirDic, ossFolder, _oSSService));
 
 
@@ -1632,11 +1637,11 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                     {
                         if (isTaskStudy)
                         {
-                            await _taskStudyRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Key.DicomStudyId, u => new TaskStudy() { StudyDIRPath = $"/{ossFolder}/DICOMDIR" });
+                            await _taskStudyRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Key.DicomStudyId, u => new TaskStudy() { StudyDIRPath = $"/{ossFolder}/{dirDic[$"{studyUid}_DICOMDIR"]}" });
                         }
                         else
                         {
-                            await _dicomStudyRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Key.DicomStudyId, u => new DicomStudy() { StudyDIRPath = $"/{ossFolder}/DICOMDIR" });
+                            await _dicomStudyRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Key.DicomStudyId, u => new DicomStudy() { StudyDIRPath = $"/{ossFolder}/{dirDic[$"{studyUid}_DICOMDIR"]}" });
                         }
 
                     }
@@ -2303,6 +2308,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                         var subjectId = item.First().SubjectId;
 
+                        var studyUid = item.Key.StudyInstanceUid;
 
                         var ossFolder = $"{inCommand.TrialId}/Image/{subjectId}/{visitId}/{item.Key.StudyInstanceUid}";
 
@@ -2310,7 +2316,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                         if (isSucess)
                         {
-                            await _dicomStudyRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Key.DicomStudyId, u => new DicomStudy() { StudyDIRPath = $"/{ossFolder}/DICOMDIR" });
+                            await _dicomStudyRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Key.DicomStudyId, u => new DicomStudy() { StudyDIRPath = $"/{ossFolder}/{dirDic[$"{studyUid}_DICOMDIR"]}" });
                         }
                     }
                 }

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

@@ -17,7 +17,18 @@ namespace IRaCIS.Core.Application.Services
     {
 
 
+        /// <summary>
+        /// 更新缩略图路径
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IResponseOutput> UpdateImageResizePath(UpdateImageResizeDTO dto)
+        {
+            await _seriesRepository.UpdatePartialFromQueryAsync(t => t.Id == dto.SeriesId, u => new DicomSeries() { ImageResizePath = dto.ImageResizePath }, true);
 
+            return ResponseOutput.Ok();
+        }
 
         //医生读片那一块有耦合，关键序列   这里暂时留存
         /// <summary> 指定资源Id，获取Dicom检查所属序列信息列表 </summary>

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

@@ -382,7 +382,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                         Id = t.Id,
 
-                        Bodypart = t.BodyPartExamined,
+                        Bodypart = t.BodyPartForEdit,
+                        BodyPartForEditOther = t.BodyPartForEditOther,
 
                         Modalities = t.Modalities,
 
@@ -433,6 +434,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                      Id = t.Id,
 
                      Bodypart = t.BodyPart,
+                     BodyPartForEditOther=t.BodyPartForEditOther,
 
                      Modalities = t.Modality,