diff --git a/IRC.Core.SCP/IRC.Core.SCP.csproj b/IRC.Core.SCP/IRC.Core.SCP.csproj
index eb6f40253..748d93eb1 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/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/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..0f52c6d19 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": 1000
},
"SystemEmailSendConfig": {
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();
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 @@
-
+
-
+