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

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

@@ -1224,6 +1224,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow;
 
+
+
         /// <summary>
         /// 问题类型
         /// </summary>

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

@@ -809,6 +809,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow;
 
+		/// <summary>
+		/// 转化显示类型
+		/// </summary>
+		public ConvertShowType ConvertShowType { get; set; } = ConvertShowType.All;
+
 		/// <summary>
 		/// 默认值
 		/// </summary>
@@ -1092,6 +1097,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow;
 
+		/// <summary>
+		/// 转化显示类型
+		/// </summary>
+		public ConvertShowType ConvertShowType { get; set; } = ConvertShowType.All;
+
 
 		/// <summary>
 		/// 默认值
@@ -1576,6 +1586,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow;
 
+		/// <summary>
+		/// 转化显示类型
+		/// </summary>
+		public ConvertShowType ConvertShowType { get; set; } = ConvertShowType.All;
+
 		/// <summary>
 		/// 默认值
 		/// </summary>
@@ -1739,6 +1754,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow;
 
+		/// <summary>
+		/// 转化显示类型
+		/// </summary>
+		public ConvertShowType ConvertShowType { get; set; } = ConvertShowType.All;
+
 		/// <summary>
 		/// 默认值
 		/// </summary>

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

@@ -109,6 +109,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
             var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).FirstNotNullAsync();
 
+
+            var isConvertTask= await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).Select(x=>x.IsConvertedTask).FirstNotNullAsync();
+
+
 			result.ReadingTaskState = visitTaskInfo.ReadingTaskState;
             var taskInfoList = await _generalCalculateService.GetReadingReportTaskList(indto.VisitTaskId);
 
@@ -117,7 +121,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             var visitTaskIds = taskInfoList.Select(x => x.VisitTaskId).ToList();
 
             var criterionId = visitTaskInfo.TrialReadingCriterionId;
-            var questionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == criterionId&&x.ShowQuestion!= ShowQuestion.Hide).ToListAsync();
+            var questionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == criterionId&&x.ShowQuestion!= ShowQuestion.Hide)
+                .WhereIf(isConvertTask,x=>x.ConvertShowType==ConvertShowType.All||x.ConvertShowType==ConvertShowType.AfterShow)
+			    .WhereIf(!isConvertTask, x => x.ConvertShowType == ConvertShowType.All || x.ConvertShowType == ConvertShowType.BeforeShow)
+				.ToListAsync();
             var tableQuestionList = await _readingTableQuestionTrialRepository.Where(x => x.TrialCriterionId == criterionId).OrderBy(x => x.ShowOrder).ToListAsync();
             var tableAnsweRowInfos = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == indto.VisitTaskId).ProjectTo<TableAnsweRowInfo>(_mapper.ConfigurationProvider).ToListAsync();
 

IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs

@@ -903,6 +903,28 @@ namespace IRaCIS.Core.Domain.Share
         Oncology = 5,
 
 
+    }
+
+	/// <summary>
+	/// 转化显示类型
+	/// </summary>
+	public enum ConvertShowType
+	{
+
+		/// <summary>
+		/// 全都显示
+		/// </summary>
+		All = 0,
+
+		/// <summary>
+		/// 转化前显示
+		/// </summary>
+		BeforeShow = 1,
+
+		/// <summary>
+		/// 转化后显示
+		/// </summary>
+		AfterShow = 2
 	}
 
 	public enum ReadingSetType

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

@@ -145,6 +145,11 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow;
 
+		/// <summary>
+		/// 转化显示类型
+		/// </summary>
+		public ConvertShowType ConvertShowType { get; set; } = ConvertShowType.All;
+
 		/// <summary>
 		/// 默认值
 		/// </summary>

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

@@ -88,6 +88,12 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow;
 
+
+		/// <summary>
+		/// 转化显示类型
+		/// </summary>
+		public ConvertShowType ConvertShowType { get; set; } = ConvertShowType.All;
+
 		/// <summary>
 		/// 备注
 		/// </summary>