Merge branch 'Test_HIR_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_HIR_Net8

IRC.Core.SCP/IRC.Core.SCP.csproj

@@ -7,28 +7,29 @@
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="AlibabaCloud.SDK.Sts20150401" Version="1.1.4" />
+	  <PackageReference Include="AlibabaCloud.SDK.Sts20150401" Version="1.1.6" />
 	  <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
 	  <PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
-	  <PackageReference Include="AWSSDK.S3" Version="3.7.405" />
+	  <PackageReference Include="AWSSDK.S3" Version="4.0.6.9" />
-	  <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.400.36" />
+	  <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.2" />
-	  <PackageReference Include="DistributedLock.Core" Version="1.0.7" />
+	  <PackageReference Include="DistributedLock.Core" Version="1.0.8" />
-	  <PackageReference Include="DistributedLock.SqlServer" Version="1.0.5" />
+	  <PackageReference Include="DistributedLock.SqlServer" Version="1.0.6" />
-	  <PackageReference Include="fo-dicom" Version="5.1.3" />
+	  <PackageReference Include="fo-dicom" Version="5.2.2" />
-	  <PackageReference Include="fo-dicom.Codecs" Version="5.15.1" />
+	  <PackageReference Include="fo-dicom.Codecs" Version="5.16.4" />
-	  <PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.1.3" />
+	  <PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.2.2" />
 	  <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" />
 	  <PackageReference Include="AutoMapper" Version="13.0.1" />
-	  <PackageReference Include="Minio" Version="6.0.4" />
+	  <PackageReference Include="Minio" Version="6.0.5" />
 	  <PackageReference Include="My.Extensions.Localization.Json" Version="3.3.0">
 		  <TreatAsUsed>true</TreatAsUsed>
 	  </PackageReference>
 	  <PackageReference Include="Panda.DynamicWebApi" Version="1.2.2" />
-	  <PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.1.2" />
+	  <PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.4.0" />
-	  <PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
+	  <PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0" />
 	  <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
-	  <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
+	  <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
 	  <PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.3" />
+	  <PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
   </ItemGroup>
 
   <ItemGroup>

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

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

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": {

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<IResponseOutput> 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();

IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj

@@ -15,9 +15,9 @@
 		<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.10" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.19" />
-		<PackageReference Include="SharpCompress" Version="0.38.0" />
+		<PackageReference Include="SharpCompress" Version="0.40.0" />
 		<PackageReference Include="SharpZipLib" Version="1.4.2" />
-		<PackageReference Include="BouncyCastle.Cryptography" Version="2.4.0" />
+		<PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" />
 		<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.7" />
 	</ItemGroup>