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

@@ -13,6 +13,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         public int FileCount { get; set; }
 
+        public string StudyName { get; set; }
+
         public List<NoneDicomStudyFileView> NoneDicomStudyFileList { get; set; } = new List<NoneDicomStudyFileView>();
 
 

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;
@@ -386,6 +388,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/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/TrialSiteUser/DTO/TrialConfigDTO.cs

@@ -69,6 +69,23 @@ namespace IRaCIS.Core.Application.Contracts
         public List<string> ModalityList { get; set; } = new List<string>();
 
 
+        /// <summary>
+        /// 是否显示检查名称
+        /// </summary>
+        public bool IsShowStudyName { get; set; } = false;
+
+        /// <summary>
+        /// 检查名称列表
+        /// </summary>
+        public List<StudyName> StudyNameList { get; set; }
+
+        /// <summary>
+        /// 图像格式
+        /// </summary>
+        [StringLength(2000)]
+        public List<string> ImageFormatList { get; set; } = new List<string>();
+
+
         public List<TrialObjectNameConfig> TrialObjectNameList { get; set; }
 
 

IRaCIS.Core.Domain/Trial/Trial.cs

@@ -250,7 +250,7 @@ public partial class Trial : BaseFullDeleteAuditEntity
     /// <summary>
     /// 检查名称列表
     /// </summary>
-    public List<StudyName> StudyNameList { get; set; } = new List<StudyName>();
+    public List<StudyName> StudyNameList { get; set; }
 
     /// <summary>
     /// 图像格式
@@ -325,6 +325,11 @@ public class StudyName
     /// 名称
     /// </summary>
     public string Name { get; set; }
+
+    /// <summary>
+    /// 英文名称
+    /// </summary>
+    public string EnName { get; set; }
 }
 
 [ComplexType]