XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
he 2025-07-24 15:42:30 +08:00
parent facb4cdc47 3f31c8ad14
commit c81cdf30a0
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs
View File

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

14
IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
View File

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

4
IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs
View File

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