diff --git a/IRaCIS.Core.API/Progranm.cs b/IRaCIS.Core.API/Progranm.cs index 40ffb2743..915ff6018 100644 --- a/IRaCIS.Core.API/Progranm.cs +++ b/IRaCIS.Core.API/Progranm.cs @@ -117,7 +117,7 @@ builder.Services.AddOptions().Configure(_configuratio builder.Services.AddOptions().Configure(_configuration.GetSection("AliyunOSS")); builder.Services.AddOptions().Configure(_configuration.GetSection("ObjectStoreService")); builder.Services.AddOptions().Configure(_configuration.GetSection("EncrypteResponseConfig")); - +builder.Services.AddOptions().Configure(_configuration.GetSection("SystemPacsConfig")); //动态WebApi + UnifiedApiResultFilter 省掉控制器代码 diff --git a/IRaCIS.Core.API/appsettings.Test_IRC.json b/IRaCIS.Core.API/appsettings.Test_IRC.json index 377d97bc2..b525fec8a 100644 --- a/IRaCIS.Core.API/appsettings.Test_IRC.json +++ b/IRaCIS.Core.API/appsettings.Test_IRC.json @@ -85,7 +85,13 @@ "CompanyNameCN": "上海展影医疗科技有限公司", "CompanyShortName": "Extensive Imaging", "CompanyShortNameCN": "展影医疗" + }, + + "SystemPacsConfig": { + "Port": "11113", + "IP": "106.14.89.110" } + diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs index 636a8c3b2..b130638a7 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs @@ -22,6 +22,7 @@ using IRaCIS.Core.Domain.Models; using IRaCIS.Application.Contracts; using SixLabors.ImageSharp.Formats.Tiff.Compression.Decompressors; using Newtonsoft.Json; +using Microsoft.Extensions.Options; namespace IRaCIS.Core.Application { @@ -1347,7 +1348,7 @@ namespace IRaCIS.Core.Application { var codeList = await _repository.Where(t => t.TrialId == incommand.TrialId) - .WhereIf(incommand.Id!=null,t=>t.Id!=incommand.Id) + .WhereIf(incommand.Id != null, t => t.Id != incommand.Id) .Select(t => t.Code).ToListAsync(); @@ -1384,5 +1385,12 @@ namespace IRaCIS.Core.Application return JsonConvert.DeserializeObject(extralConfig) ?? new TrialExtraConfig(); } + + public async Task GetTrialPacsConfigInfo(Guid trialId, [FromServices] IOptionsMonitor optionsMonitor) + { + var trialCode = await _trialRepository.Where(t => t.Id == trialId).Select(t => t.TrialCode).FirstOrDefaultAsync(); + + return new TrialPacsInfo() { Ip=optionsMonitor.CurrentValue.IP,Port=optionsMonitor.CurrentValue.Port,TrialCalledAE=$"EI{trialCode}" }; + } } } diff --git a/IRaCIS.Core.Domain.Share/Trial/TrialExpedited.cs b/IRaCIS.Core.Domain.Share/Trial/TrialExpedited.cs index 506830ba6..dcdb9c795 100644 --- a/IRaCIS.Core.Domain.Share/Trial/TrialExpedited.cs +++ b/IRaCIS.Core.Domain.Share/Trial/TrialExpedited.cs @@ -64,6 +64,15 @@ namespace IRaCIS.Core.Domain.Share } + public class TrialPacsInfo + { + public int Port { get; set; } + + public string Ip { get; set; } + + public string TrialCalledAE { get; set; } + } + public class SiteSurveyModifyFiled { public string NeedModifyFiled { get; set; } diff --git a/IRaCIS.Core.Domain/Common/Internationalization.cs b/IRaCIS.Core.Domain/Common/Internationalization.cs index 0da0a2f35..1f6b63cc7 100644 --- a/IRaCIS.Core.Domain/Common/Internationalization.cs +++ b/IRaCIS.Core.Domain/Common/Internationalization.cs @@ -29,7 +29,9 @@ namespace IRaCIS.Core.Domain.Models public Guid UpdateUserId { get; set; } - + /// + /// 0 1 2 预翻译 已确认 废除 + /// public int State { get; set; } diff --git a/IRaCIS.Core.Domain/_Config/_AppSettings.cs b/IRaCIS.Core.Domain/_Config/_AppSettings.cs index d4284b22e..fac748828 100644 --- a/IRaCIS.Core.Domain/_Config/_AppSettings.cs +++ b/IRaCIS.Core.Domain/_Config/_AppSettings.cs @@ -78,6 +78,15 @@ namespace IRaCIS.Core.Domain.Share } + public class SystemPacsConfig + { + public int Port { get; set; } + + public string IP { get; set; } + } + + + public class EncreptResponseOption { public bool IsEnable { get; set; }