From 76a2ef3cbd79d72f332e1fb24f6f0be254b425cb Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 24 Jul 2025 15:33:16 +0800 Subject: [PATCH] =?UTF-8?q?IQC=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/TrialSiteUser/DTO/TrialViewModel.cs | 9 ++++++++- .../Service/TrialSiteUser/TrialConfigService.cs | 14 +++++++++----- .../Service/TrialSiteUser/_MapConfig2.cs | 4 ++-- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs index 02cc8441c..97723c2ba 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs @@ -267,12 +267,19 @@ namespace IRaCIS.Application.Contracts public bool IsOpenLostVistRead { get; set; } = false; + + + } + + public class TrialConfigInfo: TrialExtraConfig + { #region 视图模型返回 项目术语配置 ,实际数据库没有配置 public List TrialObjectNameList { get; set; } public CollectImagesType CollectImagesEnum { get; set; } - #endregion + public bool IsIQCAutoNextTask { get; set; } + #endregion } public class TrialPacsInfo diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs index 7ae807523..e6dded93e 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs @@ -1481,17 +1481,21 @@ namespace IRaCIS.Core.Application /// /// [AllowAnonymous] - public async Task GetTrialExtralConfig(Guid trialId) + public async Task GetTrialExtralConfig(Guid trialId) { - var extralObj = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.TrialExtraConfigJsonStr, t.TrialObjectNameList, t.CollectImagesEnum }).FirstOrDefault(); + var extralObj = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.TrialExtraConfigJsonStr, t.TrialObjectNameList, t.CollectImagesEnum, t.IsIQCAutoNextTask }).FirstOrDefault(); var extralConfig = JsonConvert.DeserializeObject(extralObj?.TrialExtraConfigJsonStr) ?? new TrialExtraConfig(); - extralConfig.TrialObjectNameList = extralObj.TrialObjectNameList; + var trialConfig = _mapper.Map (extralConfig); - extralConfig.CollectImagesEnum = extralObj.CollectImagesEnum; + trialConfig.TrialObjectNameList = extralObj.TrialObjectNameList; - return extralConfig; + trialConfig.CollectImagesEnum = extralObj.CollectImagesEnum; + trialConfig.IsIQCAutoNextTask = extralObj.IsIQCAutoNextTask; + + + return trialConfig; } /// /// 获取项目Pacs 配置 diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs index 0a05dc208..d9664a718 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs @@ -65,8 +65,8 @@ namespace IRaCIS.Core.Application.Service CreateMap(); - - + CreateMap(); + } }