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

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -7149,6 +7149,11 @@
             自定义计算问题
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalQuestionBase.DefaultValue">
+            <summary>
+            默认值
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalQuestionQueryBase">
             <summary>
             查询临床数据基类
@@ -7284,6 +7289,11 @@
             关联Value
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalTableQuestionBase.DefaultValue">
+            <summary>
+            默认值
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.Service.Reading.Dto.TrialClinicalTableQuestionDto">
             <summary>
             项目临床数据问题

IRaCIS.Core.Application/Service/Reading/Dto/ClinicalQuestionDto.cs

@@ -276,6 +276,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string CalculateQuestions { get; set; } = "[]";
 
+
+        /// <summary>
+        /// 默认值
+        /// </summary>
+        public string DefaultValue { get; set; } = string.Empty;
+
         [NotMapped]
         public List<CalculateInfo> CalculateQuestionList
         {
@@ -474,6 +480,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
             }
         }
 
+        /// <summary>
+        /// 默认值
+        /// </summary>
+        public string DefaultValue { get; set; } = string.Empty;
 
         public List<string> RelevanceValueList { get; set; } = new List<string>();
     }

IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs

@@ -812,6 +812,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public ReadingVersion? ReadingVersionEnum { get; set; }
 
 
+        public ReadingTool? ReadingTool { get; set; }
+
+        /// <summary>
+        /// 阅片工具
+        /// </summary>
+        public List<string> ReadingToolList { get; set; } = new List<string>();
+
+
     }
 
 

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

@@ -393,6 +393,12 @@ namespace IRaCIS.Core.Application.Service.RC
 
                 indto.ReadingVersionEnum=(ReadingVersion)maxDic;
             }
+
+            indto.ReadingTool = ReadingTool.Dicom;
+            indto.ReadingToolList = new List<string>()
+            {
+                "Length", "Bidirectional", "RectangleROI", "ArrowAnnotate", "CircleROI"
+            };
             var entity = await _readingQuestionCriterionTrialRepository.InsertOrUpdateAsync(indto, true);
             return ResponseOutput.Ok(entity.Id.ToString());
         }