From d1f79cd06ba38537a6dc62b7d0d36c8618dee96e Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 27 Aug 2025 09:42:10 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRC.Core.SCP/IRC.Core.SCP.csproj | 27 ++++++++++---------
IRC.Core.SCP/Service/OSSService.cs | 2 +-
IRaCIS.Core.API/appsettings.Test_HIR.json | 6 ++++-
.../IRaCIS.Core.Application.xml | 14 ++++++++++
.../IRaCIS.Core.Infrastructure.csproj | 4 +--
5 files changed, 36 insertions(+), 17 deletions(-)
diff --git a/IRC.Core.SCP/IRC.Core.SCP.csproj b/IRC.Core.SCP/IRC.Core.SCP.csproj
index eb6f40253..4ea449434 100644
--- a/IRC.Core.SCP/IRC.Core.SCP.csproj
+++ b/IRC.Core.SCP/IRC.Core.SCP.csproj
@@ -7,28 +7,29 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
true
-
-
+
+
-
+
+
diff --git a/IRC.Core.SCP/Service/OSSService.cs b/IRC.Core.SCP/Service/OSSService.cs
index 845bfa116..b0332a1d5 100644
--- a/IRC.Core.SCP/Service/OSSService.cs
+++ b/IRC.Core.SCP/Service/OSSService.cs
@@ -119,7 +119,7 @@ public class AWSTempToken
public string SecretAccessKey { get; set; }
public string BucketName { get; set; }
public string ViewEndpoint { get; set; }
- public DateTime Expiration { get; set; }
+ public DateTime? Expiration { get; set; }
}
public enum ObjectStoreUse
diff --git a/IRaCIS.Core.API/appsettings.Test_HIR.json b/IRaCIS.Core.API/appsettings.Test_HIR.json
index 3f5e6ef47..cf0fc25d7 100644
--- a/IRaCIS.Core.API/appsettings.Test_HIR.json
+++ b/IRaCIS.Core.API/appsettings.Test_HIR.json
@@ -37,7 +37,11 @@
"AutoLoginOutMinutes": 120,
"AESKey": "HIR_System_AES_Key_Info",
"CmoveIntervalMinutes": 1,
- "CmoveInstanceIntervalMinutes": 1
+ "CmoveInstanceIntervalMinutes": 1,
+ // 是否强制用户定期修改密码
+ "IsNeedChangePassWord": true,
+ // 密码有效期（天），到期后必须修改
+ "ChangePassWordDays": 90
},
"SystemEmailSendConfig": {
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 2483c1e26..68e39e076 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -2138,6 +2138,13 @@
+
+
+ 设置是否忽略异地登录
+
+
+
+
验证验证码，没问题就返回用户所有的账户
@@ -13628,6 +13635,13 @@
+
+
+ 获取访视下拉
+
+
+
+
添加或更新访视计划某项
diff --git a/IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj b/IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj
index 1fdeeffd0..9eb561ec9 100644
--- a/IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj
+++ b/IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj
@@ -15,9 +15,9 @@
-
+
-
+
From 4de4e36e7381cff4bbe09e3f99cc329d5f221f07 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 27 Aug 2025 09:48:33 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRC.Core.SCP/IRC.Core.SCP.csproj | 2 +-
IRaCIS.Core.API/appsettings.Test_HIR.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/IRC.Core.SCP/IRC.Core.SCP.csproj b/IRC.Core.SCP/IRC.Core.SCP.csproj
index 4ea449434..748d93eb1 100644
--- a/IRC.Core.SCP/IRC.Core.SCP.csproj
+++ b/IRC.Core.SCP/IRC.Core.SCP.csproj
@@ -18,7 +18,7 @@
-
+
true
diff --git a/IRaCIS.Core.API/appsettings.Test_HIR.json b/IRaCIS.Core.API/appsettings.Test_HIR.json
index cf0fc25d7..0f52c6d19 100644
--- a/IRaCIS.Core.API/appsettings.Test_HIR.json
+++ b/IRaCIS.Core.API/appsettings.Test_HIR.json
@@ -41,7 +41,7 @@
// 是否强制用户定期修改密码
"IsNeedChangePassWord": true,
// 密码有效期（天），到期后必须修改
- "ChangePassWordDays": 90
+ "ChangePassWordDays": 1000
},
"SystemEmailSendConfig": {
From ed2a777fd44f71125318c4685f826a566fa5a263 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 27 Aug 2025 14:21:39 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=93=E5=AD=98?=
=?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRC.Core.SCP/Service/CStoreSCPService.cs | 4 ++++
.../Service/Visit/PatientService.cs | 10 ++++++++++
2 files changed, 14 insertions(+)
diff --git a/IRC.Core.SCP/Service/CStoreSCPService.cs b/IRC.Core.SCP/Service/CStoreSCPService.cs
index 25d18e18f..aea8f9e32 100644
--- a/IRC.Core.SCP/Service/CStoreSCPService.cs
+++ b/IRC.Core.SCP/Service/CStoreSCPService.cs
@@ -23,6 +23,7 @@ using SixLabors.ImageSharp.Formats.Jpeg;
using IRaCIS.Core.Infrastructure;
using IRaCIS.Core.Infrastructure.Extention;
using Newtonsoft.Json;
+using FellowOakDicom.Imaging.Codec;
namespace IRaCIS.Core.SCP.Service
{
@@ -325,6 +326,9 @@ namespace IRaCIS.Core.SCP.Service
{
await request.File.SaveAsync(ms);
+
+
+
//irc 从路径最后一截取Guid
storeRelativePath = await ossService.UploadToOSSAsync(ms, ossFolderPath, instanceId.ToString(), false);
diff --git a/IRaCIS.Core.Application/Service/Visit/PatientService.cs b/IRaCIS.Core.Application/Service/Visit/PatientService.cs
index 13eb261ef..dce747e3c 100644
--- a/IRaCIS.Core.Application/Service/Visit/PatientService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/PatientService.cs
@@ -153,6 +153,11 @@ namespace IRaCIS.Application.Services
var entity = await _hIRHospitalRepository.InsertOrUpdateAsync(addOrEditHIRHospital, true, exp, exp2);
+ var hospitalInfo = await _hIRHospitalRepository.Where(t => t.IsDefault == true).FirstNotNullAsync();
+
+ //更新了联网信息，也要变更缓存是否可以联网，防止修改
+ await _fusionCache.SetAsync(CacheKeys.Hospital, hospitalInfo, TimeSpan.FromDays(7));
+
return ResponseOutput.Ok(entity.Id.ToString());
}
@@ -161,6 +166,11 @@ namespace IRaCIS.Application.Services
[HttpDelete("{hIRHospitalId:guid}")]
public async Task DeleteHIRHospital(Guid hIRHospitalId)
{
+ if (_hIRHospitalRepository.Any(t => t.Id == hIRHospitalId && t.IsDefault == true))
+ {
+ return ResponseOutput.NotOk(_localizer["Patient_CannotDeleteDefaultHospital"]);
+ }
+
var success = await _hIRHospitalRepository.DeleteFromQueryAsync(t => t.Id == hIRHospitalId, true);
return ResponseOutput.Ok();