Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs

@@ -663,6 +663,29 @@ namespace IRaCIS.Core.Application.Service.RC
                 //SetChildParentQuestion(criterion.Id, trialId, systemQuestionList, readingQuestionTrialList);
                 //needAddQuestionList.AddRange(readingQuestionTrialList);
             });
+
+            // 标准的默认值
+            foreach (var criterion in needAddCriterionList)
+            {
+                switch (criterion.CriterionType)
+                {
+                    case CriterionType.IVUS:
+                        criterion.IsImageFilter = true;
+                        criterion.IsReadingTaskViewInOrder = ReadingOrder.SubjectRandom;
+                        criterion.ImageDownloadEnum = ReadingImageDownload.Subejct;
+                        criterion.ImageUploadEnum = ReadingImageUpload.IRReadingSubejctEnable;
+                        break;
+                    case CriterionType.OCT:
+                        criterion.IsImageFilter = true;
+                        criterion.IsReadingPeriod = false;
+                        criterion.IsReadingTaskViewInOrder = ReadingOrder.SubjectRandom;
+                        criterion.ImageDownloadEnum = ReadingImageDownload.Subejct;
+                        criterion.ImageUploadEnum = ReadingImageUpload.IRReadingSubejctEnable;
+                        break;
+                }
+            }
+
+
             await _readingQuestionCriterionTrialRepository.AddRangeAsync(needAddCriterionList);
             await _readingQuestionTrialRepository.AddRangeAsync(needAddQuestionList);
             await _readingQuestionTrialRepository.SaveChangesAsync();

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

@@ -193,7 +193,7 @@ namespace IRaCIS.Core.Domain.Models
 
 
         /// <summary>
-        /// 是否有阅片期
+        /// 存在阅片期
         /// </summary>
         public bool IsReadingPeriod { get; set; } = true;
 
@@ -270,20 +270,32 @@ namespace IRaCIS.Core.Domain.Models
         public bool IsAutoCreate { get; set; } = true;
         #endregion
 
-      
-       
 
+
+        /// <summary>
+        /// 阅片过程下载影像
+        /// </summary>
         public ReadingImageDownload ImageDownloadEnum { get; set; }
 
+        /// <summary>
+        /// 阅片过程上传影像
+        /// </summary>
         public ReadingImageUpload ImageUploadEnum { get; set; }
 
+        /// <summary>
+        /// 是否影像筛选
+        /// </summary>
         public bool IsImageFilter { get; set; }
     }
 
     public enum ReadingImageDownload
     {
         None = 0,
-        Subejct = 1,
+
+        /// <summary>
+        /// 按病例
+        /// </summary>
+        Subejct = 1, 
         Visit = 2,
     }
 
@@ -291,6 +303,9 @@ namespace IRaCIS.Core.Domain.Models
     {
         None = 0,
 
+        /// <summary>
+        /// 按病例
+        /// </summary>
         IRReadingSubejctEnable = 1,
 
         IRReadingVisitEnable = 2,