Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

IRaCIS.Core.Application/Service/Fixed/CriterionAdditionalAssessment.cs

@@ -1,5 +1,7 @@
-using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Application.Service.Reading.Dto;
+using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Domain.Share.Reading;
+using NPOI.POIFS.NIO;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -29,7 +31,26 @@ namespace IRaCIS.Core.Application.Service
         static AdditionalAssessment()
         {
             //Resist1.1 脑转移 默认评估问题
-            SystemDefeaultAdditionalAssessmentList.Add(new CriterionAdditionalAssessment() { CriterionType = CriterionType.RECIST1Point1, AdditionalAssessmentType = AdditionalAssessmentType.BrainMetastasis });
+            SystemDefeaultAdditionalAssessmentList.Add(new CriterionAdditionalAssessment()
+            {
+                CriterionType = CriterionType.RECIST1Point1,
+                AdditionalAssessmentType = AdditionalAssessmentType.BrainMetastasis,
+                AdditionalQuestionList = new List<ReadingQuestionTrial>(){ new ReadingQuestionTrial()
+                {
+                    LimitEdit=LimitEdit.OnlyBaseLine,
+                    DictionaryCode="ReadingYesOrNo",
+                    IsJudgeQuestion=false,
+                    IsShowInDicom=false,
+                    GlobalReadingShowType=GlobalReadingShowType.NotShow,
+                    QuestionEnName="存在脑转移",
+                    QuestionName="Brain metastases present",
+                    Type="radio",
+                    QuestionGenre=TableQuestionType.Dictionary,
+                    DataSource=DataSources.ManualEntry,
+                    ShowQuestion=ShowQuestion.Show
+
+                } }
+            });
         }
 
 

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

@@ -32,17 +32,17 @@ namespace IRaCIS.Core.Domain.Models
 		/// <summary>
 		/// 类型
 		/// </summary>
-		public string Type { get; set; }
+		public string Type { get; set; } = string.Empty;
 
         /// <summary>
         /// 父问题触发
         /// </summary>
-		public string ParentTriggerValue { get; set; }
+        public string ParentTriggerValue { get; set; } = string.Empty;
 
         /// <summary>
         /// 问题名称
         /// </summary>
-		public string QuestionName { get; set; }
+        public string QuestionName { get; set; } = string.Empty;
 
         /// <summary>
         /// 是否是必须
@@ -63,7 +63,7 @@ namespace IRaCIS.Core.Domain.Models
 		/// <summary>
 		/// 类型值
 		/// </summary>
-		public string TypeValue { get; set; }
+		public string TypeValue { get; set; } = string.Empty;
 
         public bool IsEnable { get; set; }
 
@@ -90,12 +90,12 @@ namespace IRaCIS.Core.Domain.Models
 		/// <summary>
 		/// 备注
 		/// </summary>
-		public string Remark { get; set; }
+		public string Remark { get; set; } = string.Empty;
 
         /// <summary>
         /// 分组
         /// </summary>
-		public string GroupName { get; set; }
+        public string GroupName { get; set; } = string.Empty;
 
         /// <summary>
         /// 创建时间