修改

2022-11-18 14:05:54 +08:00
parent ee7e6d4541
commit 8e29769df4
13 changed files with 110 additions and 15 deletions
@@ -555,6 +555,16 @@ namespace IRaCIS.Core.Application.Contracts
        /// </summary>
        public string TypeValue { get; set; }

+        /// <summary>
+		/// 单位
+		/// </summary>
+		public ValueUnit? Unit { get; set; }
+
+        /// <summary>
+        /// 自定义单位
+        /// </summary>
+        public string CustomUnit { get; set; } = string.Empty;
+
        /// <summary>
        /// 是否启用
        /// </summary>
@@ -723,6 +733,11 @@ namespace IRaCIS.Core.Application.Contracts
        /// </summary>
        public int? DigitPlaces { get; set; }

+        /// <summary>
+        ///  eCRF报告是否显示在图像页面
+        /// </summary>
+        public bool IseCRFShowInDicomReading { get; set; } = false;
+

        public bool IsFromSystem { get; set; } = false;

@@ -895,6 +910,11 @@ namespace IRaCIS.Core.Application.Contracts
        /// </summary>
        public Guid TrialReadingCriterionId { get; set; }

+        /// <summary>
+        ///  eCRF报告是否显示在图像页面
+        /// </summary>
+        public bool IseCRFShowInDicomReading { get; set; } 
+

        public string GlobalUpdateType { get; set; } = string.Empty;

@@ -386,15 +386,14 @@ namespace IRaCIS.Core.Application
            result.ReadingCriterionPageList = await _readingCriterionPageRepository.Where(x => x.TrialId == inDto.TrialId).ProjectTo<ReadingCriterionPageDto>(_mapper.ConfigurationProvider).OrderBy(x=>x.ShowOrder).ToListAsync();
            var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id==inDto.TrialReadingCriterionId).FirstOrDefaultAsync();
            result.ReadingInfoSignTime = trialCriterion.ReadingInfoSignTime;
-            if (trialCriterion != null)
-            {
-                result.DigitPlaces = trialCriterion.DigitPlaces;
-                result.TrialCriterionId = trialCriterion.Id;
-                result.FormType = trialCriterion.FormType;
-                result.IsFromSystem = trialCriterion.ReadingQuestionCriterionSystemId != null;
-                result.IsMustGlobalReading = trialCriterion.IsMustGlobalReading;
-                result.IsSystemCriterion = trialCriterion.ReadingQuestionCriterionSystemId != null;
-            };
+           
+            result.DigitPlaces = trialCriterion.DigitPlaces;
+            result.TrialCriterionId = trialCriterion.Id;
+            result.FormType = trialCriterion.FormType;
+            result.IsFromSystem = trialCriterion.ReadingQuestionCriterionSystemId != null;
+            result.IsMustGlobalReading = trialCriterion.IsMustGlobalReading;
+            result.IsSystemCriterion = trialCriterion.ReadingQuestionCriterionSystemId != null;
+           

            result.TrialQuestionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrial.IsConfirm && x.TrialId == inDto.TrialId&&x.ReadingQuestionCriterionTrialId == result.TrialCriterionId
            &&x.ReadingCriterionPageId==null)
@@ -466,6 +465,7 @@ namespace IRaCIS.Core.Application
                IsReadingShowPreviousResults = inDto.IsReadingShowPreviousResults,
                GlobalUpdateType=inDto.GlobalUpdateType,
                ImagePlatform=inDto.ImagePlatform,
+                IseCRFShowInDicomReading=inDto.IseCRFShowInDicomReading,
                ArbitrationRule= arbitration,
                ReadingType = inDto.ReadingType,
                IsGlobalReading = inDto.IsGlobalReading,