From a055d1c668f381abec683ef48ac656e2ce5a805f Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 16 May 2024 10:40:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=85=E7=89=87=E5=8D=95=E5=85=83=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=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              | 5 ++++-
 .../Service/TrialSiteUser/TrialConfigService.cs              | 4 ++--
 IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs  | 3 ++-
 .../ReadingCriterion/ReadingQuestionCriterionTrial.cs        | 3 +++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
index a1a8022fa..814de05b7 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
@@ -345,6 +345,8 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class GetTrialReadingInfoOutDto
     {
+        public string TrialModalitys { get; set;} 
+
         /// <summary>
         /// 项目ID
         /// </summary>
@@ -500,7 +502,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         public List<TrialCriterionAdditionalAssessmentType> TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List<TrialCriterionAdditionalAssessmentType>();
 
-
+        public string CriterionModalitys { get; set; }
 
     }
 
@@ -859,6 +861,7 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class SetCriterionReadingInfoInDto
     {
+        public string CriterionModalitys { get; set; }
 
         //是否附加评估
         public bool IsAdditionalAssessment { get; set; }
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index 20b5dffd8..6e9765ed2 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -178,7 +178,7 @@ namespace IRaCIS.Core.Application
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<GetTrialReadingInfoOutDto> GetCriterionReadingInfo(GetTrialReadingInfoInDto inDto)
+        public async Task<IResponseOutput<GetTrialReadingInfoOutDto> > GetCriterionReadingInfo(GetTrialReadingInfoInDto inDto)
         {
 
             GetTrialReadingInfoOutDto trialInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).ProjectTo<GetTrialReadingInfoOutDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
@@ -191,7 +191,7 @@ namespace IRaCIS.Core.Application
             trialInfo.TrialCriterionAdditionalAssessmentTypeList = await _trialCriterionAdditionalAssessmentTypeRepository.Where(t => t.TrialReadingCriterionId == inDto.TrialReadingCriterionId).ToListAsync();
 
 
-            return trialInfo;
+            return ResponseOutput.Ok(trialInfo) ;
         }
 
 		/// <summary>
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
index 55300c875..9b8701c4e 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
@@ -247,7 +247,8 @@ namespace IRaCIS.Core.Application.Service
 
 
 
-            CreateMap<ReadingQuestionCriterionTrial, GetTrialReadingInfoOutDto>();
+            CreateMap<ReadingQuestionCriterionTrial, GetTrialReadingInfoOutDto>()
+                .ForMember(t => t.TrialModalitys, u => u.MapFrom(c => c.Trial.Modalitys));
 
 
             CreateMap<ReadingQuestionTrial, TrialAdditionaQuestion>()
diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
index 3dbecb37b..74fafa25e 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
@@ -127,6 +127,9 @@ namespace IRaCIS.Core.Domain.Models
 
 		#region 阅片单元配置 新加
 
+
+		public string CriterionModalitys { get; set; } = string.Empty;
+
 		/// <summary>
 		/// 阅片平台 
 		/// </summary>