Compare commits

..

No commits in common. "3f31c8ad141ef71e727d3c8dc1dcdb4e3277f587" and "3c1ecf8e4325efa6cdf894300887a7f62e63a11f" have entirely different histories.

3 changed files with 8 additions and 19 deletions

View File

@ -267,19 +267,12 @@ namespace IRaCIS.Application.Contracts
public bool IsOpenLostVistRead { get; set; } = false; public bool IsOpenLostVistRead { get; set; } = false;
}
public class TrialConfigInfo: TrialExtraConfig
{
#region 视图模型返回 项目术语配置 ,实际数据库没有配置 #region 视图模型返回 项目术语配置 ,实际数据库没有配置
public List<TrialObjectNameConfig> TrialObjectNameList { get; set; } public List<TrialObjectNameConfig> TrialObjectNameList { get; set; }
public CollectImagesType CollectImagesEnum { get; set; } public CollectImagesType CollectImagesEnum { get; set; }
public bool IsIQCAutoNextTask { get; set; }
#endregion #endregion
} }
public class TrialPacsInfo public class TrialPacsInfo

View File

@ -1481,21 +1481,17 @@ namespace IRaCIS.Core.Application
/// <param name="trialId"></param> /// <param name="trialId"></param>
/// <returns></returns> /// <returns></returns>
[AllowAnonymous] [AllowAnonymous]
public async Task<TrialConfigInfo> GetTrialExtralConfig(Guid trialId) public async Task<TrialExtraConfig> GetTrialExtralConfig(Guid trialId)
{ {
var extralObj = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.TrialExtraConfigJsonStr, t.TrialObjectNameList, t.CollectImagesEnum, t.IsIQCAutoNextTask }).FirstOrDefault(); var extralObj = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.TrialExtraConfigJsonStr, t.TrialObjectNameList, t.CollectImagesEnum }).FirstOrDefault();
var extralConfig = JsonConvert.DeserializeObject<TrialExtraConfig>(extralObj?.TrialExtraConfigJsonStr) ?? new TrialExtraConfig(); var extralConfig = JsonConvert.DeserializeObject<TrialExtraConfig>(extralObj?.TrialExtraConfigJsonStr) ?? new TrialExtraConfig();
var trialConfig = _mapper.Map<TrialConfigInfo> (extralConfig); extralConfig.TrialObjectNameList = extralObj.TrialObjectNameList;
trialConfig.TrialObjectNameList = extralObj.TrialObjectNameList; extralConfig.CollectImagesEnum = extralObj.CollectImagesEnum;
trialConfig.CollectImagesEnum = extralObj.CollectImagesEnum; return extralConfig;
trialConfig.IsIQCAutoNextTask = extralObj.IsIQCAutoNextTask;
return trialConfig;
} }
/// <summary> /// <summary>
/// 获取项目Pacs 配置 /// 获取项目Pacs 配置

View File

@ -65,8 +65,8 @@ namespace IRaCIS.Core.Application.Service
CreateMap<IdentityUser, TrialSiteCRCListDTO>(); CreateMap<IdentityUser, TrialSiteCRCListDTO>();
CreateMap<TrialExtraConfig, TrialConfigInfo>();
} }
} }