合并到测试环境

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

@@ -29,7 +29,7 @@ namespace IRaCIS.Core.Application.Contracts
 
 
         [HttpGet]
-        public async Task<List<NoneDicomStudyView>> GetNoneDicomStudyList(
+        public async Task<IResponseOutput<List<NoneDicomStudyView>> > GetNoneDicomStudyList(
             [FromQuery, NotDefault] Guid subjectVisitId,
             [FromQuery] Guid? nonedicomStudyId,
             [FromQuery] bool isFilterZip,
@@ -63,7 +63,10 @@ namespace IRaCIS.Core.Application.Contracts
             }
 
 
-            return await noneDicomStudyQueryable.ToListAsync();
+            var list = await noneDicomStudyQueryable.ToListAsync();
+
+            var config = await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).Select(t => new { t.Trial.ImageFormatList, t.Trial.StudyNameList ,t.Trial.IsShowStudyName}).FirstOrDefaultAsync();
+            return ResponseOutput.Ok(list, config) ;
         }
 
 

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

@@ -15,6 +15,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         public bool IsCriticalSequence { get; set; } = false;
 
+        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/DTO/QCListViewModel.cs

@@ -166,6 +166,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

@@ -824,6 +824,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

@@ -256,7 +256,7 @@ public partial class Trial : BaseFullDeleteAuditEntity
     /// 图像格式
     /// </summary>
     [StringLength(2000)]
-    public List<string> ImageFormatList { get; set; } = new List<string>();
+    public List<string> ImageFormatList { get; set; } = new List<string>() {"jpg","jpeg","png","bmp","pdf","zip" };
     #endregion
 
     #region 邮件配置
@@ -325,6 +325,11 @@ public class StudyName
     /// 名称
     /// </summary>
     public string Name { get; set; }
+
+    /// <summary>
+    /// 英文名称
+    /// </summary>
+    public string EnName { get; set; }
 }
 
 [ComplexType]