From 4eeb817d6cbfab3d6cbb326516a459aca21b7c9f Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 18 Oct 2022 09:30:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/TrialSiteUser/DTO/TrialConfigDTO.cs   | 14 +++++---------
 .../Service/TrialSiteUser/TrialConfigService.cs   | 15 ++++++++++++---
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
index 7d5bc7a0..c86c9faf 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
@@ -703,6 +703,8 @@ namespace IRaCIS.Core.Application.Contracts
         /// </summary>
         public Guid TrialReadingCriterionId { get; set; }
 
+        public List<Guid> OncologyAssessIds { get; set; }
+
         /// <summary>
         /// 评估结果
         /// </summary>
@@ -724,12 +726,9 @@ namespace IRaCIS.Core.Application.Contracts
 
         public bool IsSign { get; set; }
 
-        public List<Guid> GlobalAssessTypeIds { get; set; }
+        public List<Guid> OncologyAssessIds { get; set; }
+
 
-        /// <summary>
-        /// 评估结果
-        /// </summary>
-        public string EvaluationResult { get; set; } = string.Empty;
 
         /// <summary>
         /// 评估原因
@@ -737,10 +736,7 @@ namespace IRaCIS.Core.Application.Contracts
         public string EvaluationReason { get; set; } = string.Empty;
 
 
-        /// <summary>
-        /// 是否显示详情
-        /// </summary>
-        public bool IsShowDetail { get; set; }
+      
     }
 
     public class GetOncologySetInDto
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index 97a4f920..f283abbf 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -158,10 +158,9 @@ namespace IRaCIS.Core.Application
 
             return new GetOncologySetOutDto
             {
-
                 EvaluationReason = trialCriterion.EvaluationReason.IsNullOrEmpty()? ReadingCommon.EvaluationReason : trialCriterion.EvaluationReason,
-                EvaluationResult= trialCriterion.EvaluationResult,
-                IsShowDetail=trialCriterion.IsShowDetail,
+                OncologyAssessIds = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == inDto.TrialReadingCriterionId && x.ParentCode == "OncologyAssess").Select(x => x.DictionaryId).ToListAsync(),
+         
                 IsSign = trialCriterion.ReadingInfoSignTime != null,
             };
         }
@@ -184,6 +183,16 @@ namespace IRaCIS.Core.Application
 
             });
 
+            await _readingCriterionDictionaryRepository.BatchDeleteNoTrackingAsync(x => x.CriterionId == inDto.TrialReadingCriterionId && x.ParentCode == "OncologyAssess");
+
+            await _readingCriterionDictionaryRepository.AddRangeAsync(inDto.OncologyAssessIds.Select(x => new ReadingCriterionDictionary
+            {
+                CriterionId = inDto.TrialReadingCriterionId,
+                DictionaryId = x,
+                IsSystemCriterion = false,
+                ParentCode = "OncologyAssess"
+            }));
+
             var result = await _readingQuestionCriterionTrialRepository.SaveChangesAsync();
             return ResponseOutput.Ok(result);
         }