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

IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs

@@ -14,6 +14,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         public int FileCount { get; set; }
 
+
         public List<NoneDicomStudyFileView> NoneDicomStudyFileList { get; set; } = new List<NoneDicomStudyFileView>();
 
 
@@ -54,6 +55,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         public int Code { get; set; }
 
+        public string StudyName { get; set; }
 
         public string VideoName { get; set; } = string.Empty;
 

IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs

@@ -18,6 +18,8 @@ namespace IRaCIS.Core.Application.Contracts.DTO
 
         public int Type { get; set; }
 
+        public string StudyName { get; set; } = String.Empty;
+
         public string Modality { get; set; } = String.Empty;
 
         public string BodyPart { get; set; } = String.Empty;
@@ -353,8 +355,13 @@ namespace IRaCIS.Core.Application.Contracts.DTO
 
         public int? NotClosedChallengeCount { get; set; }
 
+        public List<StudyName> StudyNameList { get; set; }
 
 
+        public List<string> ImageFormatList { get; set; }
+
+        public bool IsShowStudyName { get; set; } = false;
+
     }
     public class QAStudyInfoDTO
     {
@@ -389,6 +396,8 @@ namespace IRaCIS.Core.Application.Contracts.DTO
 
         public string BodyPartForEdit { get; set; } = String.Empty;
 
+        public string StudyName { get; set; } = string.Empty;
+
         public string ModalityForEdit { get; set; } = string.Empty;
 
         public bool IsHaveUploadFailed { get; set; }

IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs

@@ -161,6 +161,13 @@ namespace IRaCIS.Core.Application.Contracts
         [Comment("阅片任务产生之前 采集影像")]
         public CollectImagesType CollectImagesEnum { get; set; }
 
+        public List<StudyName> StudyNameList { get; set; } 
+
+
+        public List<string> ImageFormatList { get; set; }
+
+        public bool IsShowStudyName { get; set; } = false;
+
     }
 
 

IRaCIS.Core.Application/Service/QC/QCOperationService.cs

@@ -762,6 +762,8 @@ namespace IRaCIS.Core.Application.Image.QA
                 study.BodyPartForEdit = updateModalityCommand.BodyPart;
 
                 study.ModalityForEdit = updateModalityCommand.Modality;
+                study.StudyName = updateModalityCommand.StudyName;
+
 
                 await _dicomSeriesRepository.BatchUpdateNoTrackingAsync(t => t.StudyId == studyId, r => new DicomSeries() { BodyPartForEdit = updateModalityCommand.BodyPart });
             }

IRaCIS.Core.Application/Service/QC/_MapConfig.cs

@@ -588,7 +588,10 @@ namespace IRaCIS.Core.Application.Service
               .ForMember(d => d.SubjectFirstGiveMedicineTime, u => u.MapFrom(s => s.Subject.FirstGiveMedicineTime))
               .ForMember(d => d.SiteName, u => u.MapFrom(s => s.TrialSite.TrialSiteName))
               .ForMember(d => d.TotalChallengeCount, u => u.MapFrom(s => s.QCChallengeList.Count()))
-              .ForMember(d => d.NotClosedChallengeCount, u => u.MapFrom(s => s.QCChallengeList.Count(c => c.IsClosed == false)));
+              .ForMember(d => d.NotClosedChallengeCount, u => u.MapFrom(s => s.QCChallengeList.Count(c => c.IsClosed == false)))
+              .ForMember(d => d.IsShowStudyName, u => u.MapFrom(s => s.Trial.IsShowStudyName))
+              .ForMember(d => d.StudyNameList, u => u.MapFrom(s => s.Trial.StudyNameList))
+              .ForMember(d => d.ImageFormatList, u => u.MapFrom(s => s.Trial.ImageFormatList));
 
 
             CreateMap<Subject, QARelationInfo>(MemberList.None);