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(); + } }