修改

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

@@ -358,6 +358,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// 问题标识
 		/// </summary>
 		public QuestionMark? QuestionMark { get; set; }
+
+		public List<string> ParentTriggerValueList { get; set; }
+		public List<string> RelevanceValueList { get; set; }
+		
 	}
 
 	///<summary> ReadingTableQuestionSystemAddOrEdit  列表查询参数模型</summary>
@@ -590,6 +594,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     {
 		public Guid? Id { get; set; }
 
+		/// <summary>
+		///  eCRF报告是否显示在图像页面
+		/// </summary>
+		public bool IseCRFShowInDicomReading { get; set; } = false;
+
 		/// <summary>
 		/// 标准
 		/// </summary>
@@ -858,6 +867,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// 数据来源
 		/// </summary>
 		public DataSources? DataSource { get; set; } = DataSources.ManualEntry;
+		
+		public List<string> ParentTriggerValueList { get; set; }
+		public List<string> RelevanceValueList { get; set; }
+		public List<CalculateInfo> CalculateQuestionList { get; set; }
+
 	}
 
 	public class ReadingQuestionSystemView
@@ -1581,6 +1595,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// 自定义计算标记
 		/// </summary>
 		public string CalculateQuestions { get; set; } = "[]";
+
+
+		
+		public List<string> ParentTriggerValueList { get; set; }
+		public List<string> RelevanceValueList { get; set; }
+	
 	}
 
 	public class GetSystemCriterionSelectDto
@@ -1621,6 +1641,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public bool IsEnable { get; set; }
 
+		/// <summary>
+		///  eCRF报告是否显示在图像页面
+		/// </summary>
+		public bool IseCRFShowInDicomReading { get; set; } = false;
+
 
 		/// <summary>
 		/// 标准类型

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

@@ -389,6 +389,8 @@ namespace IRaCIS.Application.Services
             {
                 throw new BusinessValidationFailedException("问题编号重复");
             }
+            indto.ParentTriggerValue = string.Join(',', indto.ParentTriggerValueList);
+            indto.RelevanceValue = string.Join(',', indto.RelevanceValueList);
             var entity = await _readingQuestionTrialRepository.InsertOrUpdateAsync(indto, true);
             return ResponseOutput.Ok(entity.Id.ToString());
         }
@@ -525,13 +527,14 @@ namespace IRaCIS.Application.Services
         /// <summary>
         /// 新增修改想想项目表格问题
         /// </summary>
-        /// <param name="addOrEditReadingTableQuestionTrial"></param>
+        /// <param name="indto"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<IResponseOutput> AddOrUpdateReadingTableQuestionTrial(ReadingTableQuestionTrialAddOrEdit addOrEditReadingTableQuestionTrial)
+        public async Task<IResponseOutput> AddOrUpdateReadingTableQuestionTrial(ReadingTableQuestionTrialAddOrEdit indto)
         {
-
+            indto.ParentTriggerValue = string.Join(',', indto.ParentTriggerValueList);
-            var entity = await _readingTableQuestionTrialRepository.InsertOrUpdateAsync(addOrEditReadingTableQuestionTrial, true);
+            indto.RelevanceValue = string.Join(',', indto.RelevanceValueList);
+            var entity = await _readingTableQuestionTrialRepository.InsertOrUpdateAsync(indto, true);
 
             return ResponseOutput.Ok(entity.Id.ToString());
 
@@ -726,6 +729,7 @@ namespace IRaCIS.Application.Services
                     {
                         SynchronizeTime = DateTime.Now,
                         IsMustGlobalReading = systemCriterion.IsMustGlobalReading,
+                        IseCRFShowInDicomReading=systemCriterion.IseCRFShowInDicomReading,
                         IsGlobalReading = systemCriterion.IsMustGlobalReading ? true : trialCriterion.IsGlobalReading,
                     }) ;
 

IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs

@@ -65,6 +65,11 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public bool IsOncologyReading { get; set; } = false;
 
+		/// <summary>
+		///  eCRF报告是否显示在图像页面
+		/// </summary>
+		public bool IseCRFShowInDicomReading { get; set; } = false;
+
 		/// <summary>
 		/// 是否必须全局阅片
 		/// </summary>

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

@@ -5,6 +5,7 @@ using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace IRaCIS.Core.Domain.Models
 {
@@ -233,12 +234,78 @@ namespace IRaCIS.Core.Domain.Models
 
 		public List<ReadingTableQuestionTrial> ReadingTableQuestionTrialList { get; set; }
 
+        [JsonIgnore]
+		[NotMapped]
+		public List<string> ParentTriggerValueList
+        {
+            get
+            {
+                try
+                {
+                    return this.ParentTriggerValue.Split(',').ToList();
+                }
+                catch (Exception)
+                {
+
+                    return new List<string>();
+                }
+            }
+
+        }
+
+		[JsonIgnore]
+		[NotMapped]
+		public List<string> RelevanceValueList
+		{
+			get
+			{
+				try
+				{
+					return this.RelevanceValue.Split(',').ToList();
+				}
+				catch (Exception)
+				{
+
+					return new List<string>();
+				}
+			}
+
+		}
+
+		[JsonIgnore]
+		[NotMapped]
+		public List<CalculateInfo> CalculateQuestionList
+		{
+			get
+			{
+
+				try
+				{
+					var result = JsonConvert.DeserializeObject<List<CalculateInfo>>(this.CalculateQuestions);
+					return result == null ? new List<CalculateInfo>() : result;
+				}
+				catch (Exception)
+				{
+
+					return new List<CalculateInfo>();
+				}
+
+			}
+		}
+
+	}
+
+
+	public class CalculateInfo
+    {
+		public bool IsTable { get; set; }
+
+		public Guid? QuestionId { get; set; }
+
+		public Guid? TableQuestionId { get; set; }
 
 	}
 
 
 
-
-
-
 }

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

@@ -7,6 +7,9 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Collections.Generic;
+using System.Linq;
+
 namespace IRaCIS.Core.Domain.Models
 {
 	 ///<summary>
@@ -180,6 +183,64 @@ namespace IRaCIS.Core.Domain.Models
 		[ForeignKey("ReadingQuestionId")]
 		public ReadingQuestionTrial ReadingQuestionTrial { get; set; }
 
+		[JsonIgnore]
+		[NotMapped]
+		public List<string> ParentTriggerValueList
+		{
+			get
+			{
+				try
+				{
+					return this.ParentTriggerValue.Split(',').ToList();
+				}
+				catch (Exception)
+				{
+
+					return new List<string>();
+				}
+			}
+
+		}
+
+		[JsonIgnore]
+		[NotMapped]
+		public List<string> RelevanceValueList
+		{
+			get
+			{
+				try
+				{
+					return this.RelevanceValue.Split(',').ToList();
+				}
+				catch (Exception)
+				{
+
+					return new List<string>();
+				}
+			}
+
+		}
+
+		[JsonIgnore]
+		[NotMapped]
+		public List<CalculateInfo> CalculateQuestionList
+		{
+			get
+			{
+				try
+				{
+					var result = JsonConvert.DeserializeObject<List<CalculateInfo>>(this.CalculateQuestions);
+					return result == null ? new List<CalculateInfo>() : result;
+				}
+				catch (Exception)
+				{
+
+					return new List<CalculateInfo>();
+				}
+
+			}
+		}
+
 	}