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

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs

@@ -376,10 +376,24 @@ namespace IRaCIS.Core.Application.Contracts
         public string SignCode { get; set; } = string.Empty;
     }
 
+    public class KeyFile
+    {
+        /// <summary>
+        /// 文件名称
+        /// </summary>
+        public string FileName { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 文件路径
+        /// </summary>
+        public string FilePath { get; set; } = string.Empty;
+    }
     public class GetTrialReadingInfoOutDto
     {
         public ReadingVersion ReadingVersionEnum { get; set; }
 
+        public List<KeyFile> KeyFileList { get; set; }
+
         /// <summary>
         /// 阅片工具
         /// </summary>
@@ -915,6 +929,8 @@ namespace IRaCIS.Core.Application.Contracts
     {
         public List<string> ReadingToolList { get; set; } = new List<string>() { };
 
+        public List<KeyFile> KeyFileList { get; set; }=new  List<KeyFile>() { };
+
         public bool IsImageFilter { get; set; }
         public string CriterionModalitys { get; set; }
 

IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs

@@ -31,7 +31,6 @@ namespace IRaCIS.Core.Application
         IRepository<ReadingQuestionCriterionSystem> _readingQuestionCriterionSystemRepository,
         IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository,
         IRepository<ReadingCriterionPage> _readingCriterionPageRepository,
-
          IRepository<SystemCriterionKeyFile> _systemCriterionKeyFileRepository,
             IOSSService oSSService,
           IRepository<TrialCriterionKeyFile> _trialCriterionKeyFileRepository,
@@ -656,6 +655,22 @@ namespace IRaCIS.Core.Application
 
             });
 
+            List<TrialCriterionKeyFile> keyFileList = new List<TrialCriterionKeyFile>();
+            await _trialCriterionKeyFileRepository.BatchDeleteNoTrackingAsync(t => t.TrialCriterionId == inDto.TrialReadingCriterionId);
+            if (inDto.KeyFileList != null && inDto.KeyFileList.Count > 0)
+            {
+                foreach (var keyFile in inDto.KeyFileList)
+                {
+                    keyFileList.Add(new TrialCriterionKeyFile()
+                    {
+                        TrialCriterionId = inDto.TrialReadingCriterionId,
+                        FileName = keyFile.FileName,
+                        FilePath = keyFile.FilePath
+                    });
+                }
+                await _trialCriterionKeyFileRepository.AddRangeAsync(keyFileList);
+            }
+
             //判断是否存在附加评估
             if (inDto.IsAdditionalAssessment)
             {

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

@@ -235,9 +235,10 @@ namespace IRaCIS.Core.Application.Service
                 .ForMember(t => t.TrialUserList, u => u.Ignore());
 
 
-
+            CreateMap<TrialCriterionKeyFile, KeyFile>();
 
             CreateMap<ReadingQuestionCriterionTrial, GetTrialReadingInfoOutDto>()
+                   .ForMember(t => t.KeyFileList, u => u.MapFrom(c => c.KeyFileList))
                 .ForMember(t => t.TrialModalitys, u => u.MapFrom(c => c.Trial.Modalitys))
                 .ForMember(t => t.TrialReadingCriterionId, u => u.MapFrom(c => c.Id))
                  .ForMember(t => t.TrialReadingCriterionName, u => u.MapFrom(c => c.CriterionName));

IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs

@@ -17,6 +17,10 @@ public class ReadingQuestionCriterionTrial : BaseAddAuditEntity
 
     [JsonIgnore]
 
+    public List<TrialCriterionKeyFile> KeyFileList = new List<TrialCriterionKeyFile>();
+
+    [JsonIgnore]
+
     public List<TrialCriterionAdditionalAssessmentType> TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List<TrialCriterionAdditionalAssessmentType>();
     [JsonIgnore]
 

IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionKeyFile.cs

@@ -6,13 +6,20 @@ namespace IRaCIS.Core.Domain.Models;
 [Table("TrialCriterionKeyFile")]
 public class TrialCriterionKeyFile : BaseAddAuditEntity
 {
+
+    #region 导航属性
+    [ForeignKey("TrialCriterionId")]
+    [JsonIgnore]
+    public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
+    #endregion
+
     /// <summary>
     /// 姓名标准Id
     /// </summary>
     public Guid TrialCriterionId { get; set; }
     
     /// <summary>
-    /// 问价名称
+    /// 文件名称
     /// </summary>
     public string FileName { get; set; } = string.Empty;