项目AE修改

IRaCIS.Core.API/Progranm.cs

@@ -117,7 +117,7 @@ builder.Services.AddOptions().Configure<ServiceVerifyConfigOption>(_configuratio
 builder.Services.AddOptions().Configure<AliyunOSSOptions>(_configuration.GetSection("AliyunOSS"));
 builder.Services.AddOptions().Configure<ObjectStoreServiceOptions>(_configuration.GetSection("ObjectStoreService"));
 builder.Services.AddOptions().Configure<EncreptResponseOption>(_configuration.GetSection("EncrypteResponseConfig"));
-
+builder.Services.AddOptions().Configure<SystemPacsConfig>(_configuration.GetSection("SystemPacsConfig"));
 
 
 //动态WebApi + UnifiedApiResultFilter  省掉控制器代码

IRaCIS.Core.API/appsettings.Test_IRC.json

@@ -85,7 +85,13 @@
     "CompanyNameCN": "上海展影医疗科技有限公司",
     "CompanyShortName": "Extensive Imaging",
     "CompanyShortNameCN": "展影医疗"
+  },
+
+  "SystemPacsConfig": {
+    "Port": "11113",
+    "IP": "106.14.89.110"
   }
+  
 
 
 

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<TrialBodyPart>(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<TrialExtraConfig>(extralConfig) ?? new TrialExtraConfig();
         }
+
+        public async Task<TrialPacsInfo> GetTrialPacsConfigInfo(Guid trialId, [FromServices] IOptionsMonitor<SystemPacsConfig> 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}" };
+        }
     }
 }

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; }

IRaCIS.Core.Domain/Common/Internationalization.cs

@@ -29,7 +29,9 @@ namespace IRaCIS.Core.Domain.Models
 
 		public Guid UpdateUserId { get; set; }
 	
-
+		/// <summary>
+		/// 0 1  2 预翻译 已确认  废除
+		/// </summary>
 		public int State { get; set; }
 	
 

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; }