From 905fdd9861919bfc8f5f12ae59409212a7ca4949 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 9 Jul 2024 09:40:32 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BE=8E=E5=9B=BDirc=20u?= =?UTF-8?q?at=20=E6=95=B0=E6=8D=AE=E5=BA=93=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/appsettings.US_Uat_IRC.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.API/appsettings.US_Uat_IRC.json b/IRaCIS.Core.API/appsettings.US_Uat_IRC.json index 212bae7ab..352c2ffcb 100644 --- a/IRaCIS.Core.API/appsettings.US_Uat_IRC.json +++ b/IRaCIS.Core.API/appsettings.US_Uat_IRC.json @@ -7,8 +7,8 @@ } }, "ConnectionStrings": { - "RemoteNew": "Server=us-mssql-service,1433;Database=Prod_US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true", - "Hangfire": "Server=us-mssql-service,1433;Database=Prod_US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true" + "RemoteNew": "Server=us-mssql-service,1433;Database=US_Uat_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true", + "Hangfire": "Server=us-mssql-service,1433;Database=US_Uat_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true" //"RemoteNew": "Server=44.218.11.19,1435;Database=Prod_US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true", //"Hangfire": "Server=44.218.11.19,1435;Database=Prod_US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true" From d5c628d9160709ab5a1be8812b1aca52038cce9a Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 9 Jul 2024 09:50:30 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E4=BB=B6?= =?UTF-8?q?=E7=AE=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/appsettings.US_Prod_IRC.json | 12 ++++++------ IRaCIS.Core.API/appsettings.US_Uat_IRC.json | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/IRaCIS.Core.API/appsettings.US_Prod_IRC.json b/IRaCIS.Core.API/appsettings.US_Prod_IRC.json index 9831fa664..ee6807a72 100644 --- a/IRaCIS.Core.API/appsettings.US_Prod_IRC.json +++ b/IRaCIS.Core.API/appsettings.US_Prod_IRC.json @@ -62,12 +62,12 @@ }, "SystemEmailSendConfig": { - "Port": 465, - "Host": "smtp.qiye.aliyun.com", - "FromEmail": "test@extimaging.com", - "FromName": "Test_IRC", - "AuthorizationCode": "SHzyyl2021", - "CompanyName": "Elevate Imaging", + "Port": 587, + "Host": "smtp-mail.outlook.com", + "FromEmail": "donotreply@elevateimaging.ai", + "FromName": "LiLi", + "AuthorizationCode": "Q#669869497420ul", + "CompanyName": "Elevate Imaging Inc.", "CompanyNameCN": "上海展影医疗科技有限公司", "CompanyShortName": "Elevate Imaging", "CompanyShortNameCN": "展影医疗" diff --git a/IRaCIS.Core.API/appsettings.US_Uat_IRC.json b/IRaCIS.Core.API/appsettings.US_Uat_IRC.json index 352c2ffcb..9da9a062d 100644 --- a/IRaCIS.Core.API/appsettings.US_Uat_IRC.json +++ b/IRaCIS.Core.API/appsettings.US_Uat_IRC.json @@ -72,12 +72,12 @@ }, "SystemEmailSendConfig": { - "Port": 465, - "Host": "smtp.qiye.aliyun.com", - "FromEmail": "test@extimaging.com", - "FromName": "Test_IRC", - "AuthorizationCode": "SHzyyl2021", - "CompanyName": "Elevate Imaging", + "Port": 587, + "Host": "smtp-mail.outlook.com", + "FromEmail": "donotreply@elevateimaging.ai", + "FromName": "LiLi", + "AuthorizationCode": "Q#669869497420ul", + "CompanyName": "Elevate Imaging Inc.", "CompanyNameCN": "上海展影医疗科技有限公司", "CompanyShortName": "Elevate Imaging", "CompanyShortNameCN": "展影医疗" From 06209a945dfc0acfbcb76d7a62b6a922a2882ff1 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 9 Jul 2024 13:12:59 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E9=80=81?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/appsettings.US_Prod_IRC.json | 3 ++- IRaCIS.Core.API/appsettings.US_Uat_IRC.json | 3 ++- IRaCIS.Core.Application/Helper/SendEmailHelper.cs | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/IRaCIS.Core.API/appsettings.US_Prod_IRC.json b/IRaCIS.Core.API/appsettings.US_Prod_IRC.json index ee6807a72..4641c5c50 100644 --- a/IRaCIS.Core.API/appsettings.US_Prod_IRC.json +++ b/IRaCIS.Core.API/appsettings.US_Prod_IRC.json @@ -70,7 +70,8 @@ "CompanyName": "Elevate Imaging Inc.", "CompanyNameCN": "上海展影医疗科技有限公司", "CompanyShortName": "Elevate Imaging", - "CompanyShortNameCN": "展影医疗" + "CompanyShortNameCN": "展影医疗", + "SiteUrl": "https://lili.elevateimaging.ai/login" } } diff --git a/IRaCIS.Core.API/appsettings.US_Uat_IRC.json b/IRaCIS.Core.API/appsettings.US_Uat_IRC.json index 9da9a062d..5bd1d0708 100644 --- a/IRaCIS.Core.API/appsettings.US_Uat_IRC.json +++ b/IRaCIS.Core.API/appsettings.US_Uat_IRC.json @@ -80,7 +80,8 @@ "CompanyName": "Elevate Imaging Inc.", "CompanyNameCN": "上海展影医疗科技有限公司", "CompanyShortName": "Elevate Imaging", - "CompanyShortNameCN": "展影医疗" + "CompanyShortNameCN": "展影医疗", + "SiteUrl": "https://lili.test.elevateimaging.ai/login" } } diff --git a/IRaCIS.Core.Application/Helper/SendEmailHelper.cs b/IRaCIS.Core.Application/Helper/SendEmailHelper.cs index 5120c9c83..974a60f02 100644 --- a/IRaCIS.Core.Application/Helper/SendEmailHelper.cs +++ b/IRaCIS.Core.Application/Helper/SendEmailHelper.cs @@ -29,7 +29,7 @@ public static class SendEmailHelper //await smtp.AuthenticateAsync("zhou941003@qq.com", "sqfhlpfdvnexbcab"); - await smtp.ConnectAsync(_systemEmailConfig.Host, _systemEmailConfig.Port, SecureSocketOptions.SslOnConnect); + await smtp.ConnectAsync(_systemEmailConfig.Host, _systemEmailConfig.Port, SecureSocketOptions.Auto); await smtp.AuthenticateAsync(_systemEmailConfig.FromEmail, _systemEmailConfig.AuthorizationCode); @@ -55,7 +55,7 @@ public static class SendEmailHelper using (var client = new MailKit.Net.Smtp.SmtpClient()) { - await client.ConnectAsync(_systemEmailConfig.Host, _systemEmailConfig.Port, SecureSocketOptions.SslOnConnect); + await client.ConnectAsync(_systemEmailConfig.Host, _systemEmailConfig.Port, SecureSocketOptions.Auto); await client.AuthenticateAsync(_systemEmailConfig.FromEmail, _systemEmailConfig.AuthorizationCode); @@ -133,7 +133,7 @@ public static class SendEmailHelper smtp.ServerCertificateValidationCallback = (s, c, h, e) => true; - await smtp.ConnectAsync(sMTPEmailConfig.Host, sMTPEmailConfig.Port, SecureSocketOptions.SslOnConnect); + await smtp.ConnectAsync(sMTPEmailConfig.Host, sMTPEmailConfig.Port, SecureSocketOptions.Auto); await smtp.AuthenticateAsync(sMTPEmailConfig.UserName, sMTPEmailConfig.AuthorizationCode); From e6bd7ad0ea3d93dd2deee9cb67ec1f86c93a01a5 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 9 Jul 2024 14:20:00 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9pacs=20=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/TrialSiteUser/DTO/DicomAEViewModel.cs | 7 +++++-- .../Service/TrialSiteUser/TrialDicomAEService.cs | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/DicomAEViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/DicomAEViewModel.cs index 6e335b36d..f3f03e1ce 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/DicomAEViewModel.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/DicomAEViewModel.cs @@ -21,9 +21,9 @@ namespace IRaCIS.Core.Application.ViewModel public bool IsTestOK { get; set; } - public bool IsPACSConnect { get; set; } + //public bool IsPACSConnect { get; set; } - public bool IsTrialPACSConfirmed { get; set; } + //public bool IsTrialPACSConfirmed { get; set; } } @@ -58,6 +58,9 @@ namespace IRaCIS.Core.Application.ViewModel public int Port { get; set; } public string Modality { get; set; } = string.Empty; public string Description { get; set; } = string.Empty; + + + public bool IsPACSConnect { get; set; } } diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialDicomAEService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialDicomAEService.cs index 982bab572..419c14e7b 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialDicomAEService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialDicomAEService.cs @@ -86,6 +86,8 @@ namespace IRaCIS.Core.Application.Service // 在此处拷贝automapper 映射 var entity = await _dicomAERepository.InsertOrUpdateAsync(addOrEditDicomAE, true, verifyExp1); + await _trialRepository.UpdatePartialFromQueryAsync(t => t.Id == addOrEditDicomAE.TrialId, u => new Trial() { IsPACSConnect = addOrEditDicomAE.IsPACSConnect }, true); + return ResponseOutput.Ok(entity.Id.ToString()); } From e55bc5fe7a61ca5832922f3ff54e8f585f1627e3 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 9 Jul 2024 14:25:34 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs index 96041148e..d81b1b5c8 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs @@ -49,6 +49,9 @@ namespace IRaCIS.Core.Application.Service CreateMap(); CreateMap().ReverseMap(); + CreateMap(); + + } } From 0075c18cd8fa2a0a69702c7ec5a2c11f6082eb31 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 9 Jul 2024 14:56:47 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=9A=84=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/TrialSiteUser/TrialDicomAEService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialDicomAEService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialDicomAEService.cs index 419c14e7b..ba4624cd2 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialDicomAEService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialDicomAEService.cs @@ -60,7 +60,7 @@ namespace IRaCIS.Core.Application.Service public async Task> GetTrialDicomAE(Guid trialId) { var dicomAE = _dicomAERepository.Where(t => t.TrialId == trialId).ProjectTo(_mapper.ConfigurationProvider).FirstOrDefault(); - var trialConfig = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.IsPACSConnect, t.IsTrialPACSConfirmed }); + var trialConfig = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.IsPACSConnect, t.IsTrialPACSConfirmed }).FirstOrDefaultAsync(); return ResponseOutput.Ok(dicomAE, trialConfig); } From cf45169de2caa31ce1874641db0b2dce2241f77c Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 9 Jul 2024 16:16:10 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRC.Core.SCP/Service/CStoreSCPService.cs | 2 ++ .../Service/TrialSiteUser/TrialDicomAEService.cs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/IRC.Core.SCP/Service/CStoreSCPService.cs b/IRC.Core.SCP/Service/CStoreSCPService.cs index 261ca563b..a0c276107 100644 --- a/IRC.Core.SCP/Service/CStoreSCPService.cs +++ b/IRC.Core.SCP/Service/CStoreSCPService.cs @@ -163,6 +163,8 @@ namespace IRaCIS.Core.SCP.Service _upload.EndTime = DateTime.Now; _upload.StudyCount = _SCPStudyIdList.Count; + _upload.TrialId=_trialId; + _upload.TrialSiteId=_trialSiteId; await _SCPImageUploadRepository.AddAsync(_upload, true); diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialDicomAEService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialDicomAEService.cs index ba4624cd2..beb413107 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialDicomAEService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialDicomAEService.cs @@ -60,7 +60,7 @@ namespace IRaCIS.Core.Application.Service public async Task> GetTrialDicomAE(Guid trialId) { var dicomAE = _dicomAERepository.Where(t => t.TrialId == trialId).ProjectTo(_mapper.ConfigurationProvider).FirstOrDefault(); - var trialConfig = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.IsPACSConnect, t.IsTrialPACSConfirmed }).FirstOrDefaultAsync(); + var trialConfig = await _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.IsPACSConnect, t.IsTrialPACSConfirmed }).FirstOrDefaultAsync(); return ResponseOutput.Ok(dicomAE, trialConfig); } From d483aca73b7df9295422f09bcbab12c1b22e89f0 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 9 Jul 2024 16:27:07 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs index d81b1b5c8..84c15094d 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs @@ -50,9 +50,13 @@ namespace IRaCIS.Core.Application.Service CreateMap().ReverseMap(); CreateMap(); + + CreateMap(); + + } } From d1e4863e01ff7ac57219a01a4eb6404868db7024 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 9 Jul 2024 17:03:20 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=BE=E5=90=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/TrialSiteUser/TrialConfigService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs index 4be695071..91e4e0232 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs @@ -1162,11 +1162,11 @@ namespace IRaCIS.Core.Application { var trialInfo = (await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialConfig.TrialId)).IfNullThrowException(); trialInfo.IsPACSConnect = trialConfig.IsPACSConnect; - trialConfig.IsTrialPACSConfirmed = trialConfig.IsTrialPACSConfirmed; + trialInfo.IsTrialPACSConfirmed = trialConfig.IsTrialPACSConfirmed; trialInfo.UpdateTime = DateTime.Now; await _trialRepository.SaveChangesAsync(); - return ResponseOutput.Ok(await _repository.SaveChangesAsync()); + return ResponseOutput.Ok(); }