修改

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

@@ -94,6 +94,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public bool CurrenShortBigger10 { get; set; }
 
+        /// <summary>
+        /// 淋巴结非靶病灶状态全部为消失
+        /// </summary>
+        public bool NonTargetStateIsLoss { get; set; }
+
         /// <summary>
         /// 该淋巴结靶病灶短径绝对增加值≥5 mm
         /// </summary>

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

@@ -99,6 +99,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public ValueOfType? ValueType { get; set; }
 
+        /// <summary>
+		/// 自定义单位
+		/// </summary>
+		public string CustomUnit { get; set; } = string.Empty;
+
         /// <summary>
         /// 单位
         /// </summary>

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

@@ -299,6 +299,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public ValueUnit? Unit { get; set; }
 
+		/// <summary>
+		/// 自定义单位
+		/// </summary>
+		public string CustomUnit { get; set; } = string.Empty;
+
 		/// <summary>
 		/// 数据来源
 		/// </summary>
@@ -834,6 +839,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public ValueUnit? Unit { get; set; }
 
+		/// <summary>
+		/// 自定义单位
+		/// </summary>
+		public string CustomUnit { get; set; } = string.Empty;
+
 		/// <summary>
 		/// 自定义计算标记
 		/// </summary>
@@ -1553,6 +1563,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public ValueUnit? Unit { get; set; }
 
+		/// <summary>
+		/// 自定义单位
+		/// </summary>
+		public string CustomUnit { get; set; } = string.Empty;
+
 		/// <summary>
 		/// 自定义计算标记
 		/// </summary>

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

@@ -431,6 +431,8 @@ namespace IRaCIS.Application.Services
 
             var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
 
+            var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == taskinfo.TrialReadingCriterionId).FirstNotNullAsync();
+
             //if (taskinfo.TaskState != TaskState.Effect)
             //{
             //    throw new BusinessValidationFailedException($"当前任务已失效！");
@@ -448,8 +450,14 @@ namespace IRaCIS.Application.Services
 
             #region 获取问题及答案
 
-            var qusetionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == criterionId)
-                  .ProjectTo<TrialReadQuestionData>(_mapper.ConfigurationProvider).Where(x => x.IsShowInDicom && (x.Type == ReadingQestionType.Table || x.Type == ReadingQestionType.Group)).OrderBy(x => x.ShowOrder).ToListAsync();
+            var qusetionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == criterionId).ProjectTo<TrialReadQuestionData>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();
+
+            if (!criterionInfo.IseCRFShowInDicomReading)
+            {
+                qusetionList= qusetionList.Where(x => x.IsShowInDicom && (x.Type == ReadingQestionType.Table || x.Type == ReadingQestionType.Group)).OrderBy(x => x.ShowOrder).ToList(); 
+            }
+
+
 
             var usedGurops = qusetionList.Where(x => x.Type == ReadingQestionType.Table).Select(x => x.GroupName).ToList();
             qusetionList = qusetionList.Where(x => usedGurops.Contains(x.GroupName)).ToList();