修改代码

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

@@ -2218,6 +2218,16 @@
             限制编辑
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingReportDto.MaxAnswerLength">
+            <summary>
+            最大答案长度
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingReportDto.FileType">
+            <summary>
+            文件类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingReportDto.IsShowInDicom">
             <summary>
             是否显示在Dicom阅片中
@@ -2318,6 +2328,21 @@
             TrialId
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.FristAddTaskId">
+            <summary>
+            首次添加任务ID
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.WW">
+            <summary>
+            窗宽WW
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.WL">
+            <summary>
+            窗位WL
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.InstanceId">
             <summary>
             InstanceId
@@ -2488,6 +2513,21 @@
             是Dicom阅片
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTableAnswerRowInfoOutDto.FristAddTaskId">
+            <summary>
+            首次添加任务ID
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTableAnswerRowInfoOutDto.WW">
+            <summary>
+            窗宽WW
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTableAnswerRowInfoOutDto.WL">
+            <summary>
+            窗位WL
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTableAnswerRowInfoOutDto.MeasureData">
             <summary>
             MeasureData
@@ -2548,6 +2588,16 @@
             限制编辑
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GlobalQuestionInfo.MaxAnswerLength">
+            <summary>
+            最大答案长度
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GlobalQuestionInfo.FileType">
+            <summary>
+            文件类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GlobalQuestionInfo.DictionaryCode">
             <summary>
             字典code
@@ -3888,6 +3938,16 @@
             限制编辑
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.MaxAnswerLength">
+            <summary>
+            最大答案长度
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.FileType">
+            <summary>
+            文件类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.CustomUnit">
             <summary>
             自定义单位
@@ -3956,6 +4016,16 @@
             限制编辑
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionSystemAddOrEdit.MaxAnswerLength">
+            <summary>
+            最大答案长度
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionSystemAddOrEdit.FileType">
+            <summary>
+            文件类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionSystemAddOrEdit.DictionaryCode">
             <summary>
             字典code
@@ -4284,6 +4354,16 @@
             限制编辑
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.MaxAnswerLength">
+            <summary>
+            最大答案长度
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.FileType">
+            <summary>
+            文件类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.DataSource">
             <summary>
             数据来源
@@ -4324,6 +4404,16 @@
             限制编辑
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.MaxAnswerLength">
+            <summary>
+            最大答案长度
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.FileType">
+            <summary>
+            文件类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.Id">
             <summary>
             Id
@@ -4644,6 +4734,16 @@
             限制编辑
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.MaxAnswerLength">
+            <summary>
+            最大答案长度
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.FileType">
+            <summary>
+            文件类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.DataSource">
             <summary>
             数据来源
@@ -4949,6 +5049,16 @@
             限制编辑
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.MaxAnswerLength">
+            <summary>
+            最大答案长度
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.FileType">
+            <summary>
+            文件类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.CustomUnit">
             <summary>
             自定义单位

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

@@ -26,6 +26,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// 限制编辑
         /// </summary>
         public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
+
+        /// <summary>
+		/// 最大答案长度
+		/// </summary>
+		public int? MaxAnswerLength { get; set; }
+
+        /// <summary>
+		/// 文件类型
+		/// </summary>
+		public string? FileType { get; set; }
         public Guid QuestionId { get; set; }
 
         public Guid TableQuestionId { get; set; }
@@ -1109,6 +1119,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
 
+        /// <summary>
+		/// 最大答案长度
+		/// </summary>
+		public int? MaxAnswerLength { get; set; }
+
+        /// <summary>
+		/// 文件类型
+		/// </summary>
+		public string? FileType { get; set; }
+
         /// <summary>
 		/// 字典code
 		/// </summary>

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

@@ -319,6 +319,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
 
+		/// <summary>
+		/// 最大答案长度
+		/// </summary>
+		public int? MaxAnswerLength { get; set; }
+
+		/// <summary>
+		/// 文件类型
+		/// </summary>
+		public string? FileType { get; set; }
+
 		/// <summary>
 		/// 自定义单位
 		/// </summary>
@@ -416,6 +426,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// 限制编辑
 		/// </summary>
 		public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
+
+		/// <summary>
+		/// 最大答案长度
+		/// </summary>
+		public int? MaxAnswerLength { get; set; }
+
+		/// <summary>
+		/// 文件类型
+		/// </summary>
+		public string? FileType { get; set; }
 		public Guid? Id { get; set; }
 		public Guid ReadingQuestionId { get; set; }
 		public string Type { get; set; } = string.Empty;
@@ -937,6 +957,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
 
+		/// <summary>
+		/// 最大答案长度
+		/// </summary>
+		public int? MaxAnswerLength { get; set; }
+
+		/// <summary>
+		/// 文件类型
+		/// </summary>
+		public string? FileType { get; set; }
+
 		/// <summary>
 		/// 数据来源
 		/// </summary>
@@ -985,6 +1015,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
 
+		/// <summary>
+		/// 最大答案长度
+		/// </summary>
+		public int? MaxAnswerLength { get; set; }
+
+		/// <summary>
+		/// 文件类型
+		/// </summary>
+		public string? FileType { get; set; }
+
 		/// <summary>
 		/// Id
 		/// </summary>
@@ -1459,6 +1499,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
 
+		/// <summary>
+		/// 最大答案长度
+		/// </summary>
+		public int? MaxAnswerLength { get; set; }
+
+		/// <summary>
+		/// 文件类型
+		/// </summary>
+		public string? FileType { get; set; }
+
 		/// <summary>
 		/// 数据来源
 		/// </summary>
@@ -1791,6 +1841,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
 
+		/// <summary>
+		/// 最大答案长度
+		/// </summary>
+		public int? MaxAnswerLength { get; set; }
+
+		/// <summary>
+		/// 文件类型
+		/// </summary>
+		public string? FileType { get; set; }
+
 		/// <summary>
 		/// 自定义单位
 		/// </summary>

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs

@@ -213,6 +213,8 @@ namespace IRaCIS.Application.Services
                       AnswerGroup = y.ReadingQuestionTrial.AnswerGroup,
                       QuestionType = y.ReadingQuestionTrial.QuestionType,
                       LimitEdit= y.ReadingQuestionTrial.LimitEdit,
+                      MaxAnswerLength=y.ReadingQuestionTrial.MaxAnswerLength,
+                      FileType=y.ReadingQuestionTrial.FileType,
                       QuestionGenre = y.ReadingQuestionTrial.QuestionGenre,
                       DictionaryCode = y.ReadingQuestionTrial.DictionaryCode,
                       GlobalReadingShowType=y.ReadingQuestionTrial.GlobalReadingShowType,
@@ -284,6 +286,8 @@ namespace IRaCIS.Application.Services
                       QuestionName = lr.question.QuestionName,
                       QuestionType = lr.question.QuestionType,
                       LimitEdit=lr.question.LimitEdit,
+                      MaxAnswerLength=lr.question.MaxAnswerLength,
+                      FileType=lr.question.FileType,
                       QuestionGenre = lr.question.QuestionGenre,
                       DictionaryCode = lr.question.DictionaryCode,
                       GlobalReadingShowType = lr.question.GlobalReadingShowType,

IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs

@@ -146,6 +146,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 QuestionGenre = x.QuestionGenre,
                 DictionaryCode = x.DictionaryCode,
                 LimitEdit=  x.LimitEdit,
+                MaxAnswerLength=x.MaxAnswerLength,
+                FileType=x.FileType,
                 TypeValue = x.TypeValue,
                 QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
                 ShowOrder = x.ShowOrder,
@@ -169,6 +171,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     QuestionGenre = x.QuestionGenre,
                     GroupEnName=x.GroupEnName,
                     LimitEdit = x.LimitEdit,
+                    MaxAnswerLength=x.MaxAnswerLength,
+                    FileType=x.FileType,
                     DictionaryCode = x.DictionaryCode,
                     Type = x.Type,
                     QuestionType = x.QuestionType,
@@ -238,6 +242,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                             IsShowInDicom = question.IsShowInDicom,
                             DataSource = x.DataSource,
                             LimitEdit = x.LimitEdit,
+                            MaxAnswerLength=x.MaxAnswerLength,
+                            FileType=x.FileType,
                             LesionType = question.LesionType,
                             TableQuestionType = x.TableQuestionType,
                             DictionaryCode = x.DictionaryCode,

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs

@@ -182,6 +182,16 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public DataSources DataSource { get; set; } = DataSources.ManualEntry;
 
+		/// <summary>
+		/// 最大答案长度
+		/// </summary>
+		public int? MaxAnswerLength { get; set; }
+
+		/// <summary>
+		/// 文件类型
+		/// </summary>
+		public string? FileType { get; set; }
+
 		[JsonIgnore]
 		[ForeignKey("ReadingQuestionCriterionSystemId")]
 		public ReadingQuestionCriterionSystem ReadingQuestionCriterionSystem { get; set; }

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs

@@ -163,6 +163,16 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public int? MaxQuestionCount { get; set; }
 
+		/// <summary>
+		/// 最大答案长度
+		/// </summary>
+		public int? MaxAnswerLength { get; set; }
+
+		/// <summary>
+		/// 文件类型
+		/// </summary>
+		public string? FileType { get; set; }
+
 		/// <summary>
 		/// 是否显示在Dicom阅片中
 		/// </summary>

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs

@@ -163,6 +163,16 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
 
+		/// <summary>
+		/// 最大答案长度
+		/// </summary>
+		public int? MaxAnswerLength { get; set; }
+
+		/// <summary>
+		/// 文件类型
+		/// </summary>
+		public string? FileType { get; set; }
+
 		[ForeignKey("DependParentId")]
 		[JsonIgnore]
 		public ReadingTableQuestionSystem DependParentQuestion { get; set; }

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs

@@ -185,6 +185,16 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public DataSources DataSource { get; set; } = DataSources.ManualEntry;
 
+		/// <summary>
+		/// 最大答案长度
+		/// </summary>
+		public int? MaxAnswerLength { get; set; }
+
+		/// <summary>
+		/// 文件类型
+		/// </summary>
+		public string? FileType { get; set; }
+
 		[JsonIgnore]
 		[ForeignKey("DependParentId")]
 		public ReadingTableQuestionTrial DependParentQuestion { get; set; }