From 32ee818be8815d3e1a18c760c068b6c4294c6afa Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 24 Nov 2025 10:35:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRC.Core.SCP/Properties/launchSettings.json | 10 ++++++++++ IRC.Core.SCP/Service/CStoreSCPService.cs | 2 +- IRC.Core.SCP/appsettings.Prod_HIR_SCP.json | 6 +++--- .../Service/Visit/DTO/PatientViewModel.cs | 2 ++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/IRC.Core.SCP/Properties/launchSettings.json b/IRC.Core.SCP/Properties/launchSettings.json index 51e43cc85..049f9f8d7 100644 --- a/IRC.Core.SCP/Properties/launchSettings.json +++ b/IRC.Core.SCP/Properties/launchSettings.json @@ -20,6 +20,16 @@ "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Uat_HIR_SCP" } + }, + "Prod_HIR_SCP": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "launchUrl": "swagger", + "applicationUrl": "http://localhost:6200", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Prod_HIR_SCP" + } } } } diff --git a/IRC.Core.SCP/Service/CStoreSCPService.cs b/IRC.Core.SCP/Service/CStoreSCPService.cs index fb51d25a2..8b4201d7d 100644 --- a/IRC.Core.SCP/Service/CStoreSCPService.cs +++ b/IRC.Core.SCP/Service/CStoreSCPService.cs @@ -318,7 +318,7 @@ namespace IRaCIS.Core.SCP.Service var _studyRepository = _serviceProvider.GetService>(); - if (exception == null || _releasedNormally == false) + if (exception != null || _releasedNormally == false) { //客户端断网，恢复后，也是没有异常的，估计是超时走了关闭 diff --git a/IRC.Core.SCP/appsettings.Prod_HIR_SCP.json b/IRC.Core.SCP/appsettings.Prod_HIR_SCP.json index fc3406127..a5550d41c 100644 --- a/IRC.Core.SCP/appsettings.Prod_HIR_SCP.json +++ b/IRC.Core.SCP/appsettings.Prod_HIR_SCP.json @@ -10,7 +10,7 @@ "ObjectStoreUse": "MinIO", "MinIO": { "EndPoint": "47.102.87.18", - "Port": "9001", + "Port": "9000", "UseSSL": false, "AccessKeyId": "fbStsVYCIPKHQneeqMwD", "SecretAccessKey": "TzgvyA3zGXMUnpilJNUlyMYHfosl1hBMl6lxPmjy", @@ -20,8 +20,8 @@ }, "ConnectionStrings": { - "RemoteNew": "Server=mssql,1433;Database=HIR_Prod;User ID=sa;Password=xc_123456;TrustServerCertificate=true", - "Hangfire": "Server=mssql,1433;Database=HIR_Prod_Hangfire;User ID=sa;Password=xc_123456;TrustServerCertificate=true" + "RemoteNew": "Server=47.102.87.183,1434;Database=HIR_Prod;User ID=sa;Password=xc_123456;TrustServerCertificate=true", + "Hangfire": "Server=47.102.87.183,1434;Database=HIR_Prod_Hangfire;User ID=sa;Password=xc_123456;TrustServerCertificate=true" }, "DicomSCPServiceConfig": { "IsSupportThirdService": true, diff --git a/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs b/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs index 2a6078c3b..5b88fcd7f 100644 --- a/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs +++ b/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs @@ -1218,6 +1218,8 @@ namespace IRaCIS.Application.Contracts public string StudyInstanceUid { get; set; } public string StudyDIRPath { get; set; } + public List ModalityList => SeriesList.Select(t => t.Modality).ToList(); + public List SeriesList { get; set; } }