继续测试

This reverts commit 48aafdc713.

IRC.Core.Dicom/BusinessFilter/ModelActionFilter .cs

@@ -1,37 +0,0 @@
-using IRaCIS.Core.Infrastructure.Extention;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.Localization;
-using Newtonsoft.Json;
-
-
-namespace IRaCIS.Core.SCP.Filter
-{
-
-
-    public class ModelActionFilter : ActionFilterAttribute, IActionFilter
-    {
-		public IStringLocalizer _localizer;
-		public ModelActionFilter(IStringLocalizer localizer)
-        {
-			_localizer = localizer;
-		}
-
-		public override void OnActionExecuting(ActionExecutingContext context)
-		{
-            if (!context.ModelState.IsValid)
-            {
-
-                var validationErrors = context.ModelState
-                                              .Keys
-                                              .SelectMany(k => context.ModelState[k]!.Errors)
-                                              .Select(e => e.ErrorMessage)
-                                              .ToArray();
-     
-                //---提供给接口的参数无效。
-                context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["ModelAction_InvalidAPIParameter"] + JsonConvert.SerializeObject( validationErrors)));
-            }
-        }
-    }
-
-}

IRC.Core.Dicom/BusinessFilter/ProjectExceptionFilter.cs

@@ -1,61 +0,0 @@
-using IRaCIS.Core.Infrastructure;
-using IRaCIS.Core.Infrastructure.Extention;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Logging;
-
-namespace IRaCIS.Core.SCP.Filter
-{
-    public class ProjectExceptionFilter : Attribute, IExceptionFilter
-    {
-        private readonly ILogger<ProjectExceptionFilter> _logger;
-
-		public IStringLocalizer _localizer;
-
-		public ProjectExceptionFilter(IStringLocalizer localizer, ILogger<ProjectExceptionFilter> logger)
-        {
-            _logger = logger;
-			_localizer = localizer;
-		}
-        public void OnException(ExceptionContext context)
-        {
-            //context.ExceptionHandled;//记录当前这个异常是否已经被处理过了
-
-            if (!context.ExceptionHandled)
-            {
-                if (context.Exception.GetType().Name == "DbUpdateConcurrencyException")
-                {
-                //---并发更新，当前不允许该操作
-                    context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["ProjectException_ConcurrentUpdateNotAllowed"] + context.Exception.Message));
-                }
-
-                if (context.Exception.GetType() == typeof(BusinessValidationFailedException))
-                {
-					var error = context.Exception as BusinessValidationFailedException;
-
-					context.Result = new JsonResult(ResponseOutput.NotOk(context.Exception.Message, error!.Code));
-				}
-                else if(context.Exception.GetType() == typeof(QueryBusinessObjectNotExistException))
-                {
-                    context.Result = new JsonResult(ResponseOutput.NotOk( context.Exception.Message, ApiResponseCodeEnum.DataNotExist));
-                }
-                else
-                {
-                    context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["Project_ExceptionContactDeveloper"] + (context.Exception.InnerException is null ? (context.Exception.Message /*+ context.Exception.StackTrace*/)
-                        : (context.Exception.InnerException?.Message /*+ context.Exception.InnerException?.StackTrace*/)), ApiResponseCodeEnum.ProgramException));
-                }
-
-
-                _logger.LogError(context.Exception.InnerException is null ? (context.Exception.Message + context.Exception.StackTrace) : (context.Exception.InnerException?.Message + context.Exception.InnerException?.StackTrace));
-
-
-            }
-            else
-            {
-                //继续
-            }
-            context.ExceptionHandled = true;//标记当前异常已经被处理过了
-        }
-    }
-}

IRC.Core.Dicom/BusinessFilter/UnifiedApiResultFilter.cs

@@ -1,120 +0,0 @@
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Mvc;
-using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Infrastructure.Extention;
-
-namespace IRaCIS.Core.Application.Service.BusinessFilter
-{
-    /// <summary>
-    ///  统一返回前端数据包装，之前在控制器包装，现在修改为动态Api  在ResultFilter这里包装，减少重复冗余代码
-    /// by zhouhang 2021.09.12 周末
-    /// </summary>
-    public class UnifiedApiResultFilter : Attribute, IAsyncResultFilter  
-    {             
-        /// <summary>
-        /// 异步版本
-        /// </summary>
-        /// <param name="context"></param>
-        /// <param name="next"></param>
-        /// <returns></returns>
-        public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
-        {
-
-            if (context.Result is ObjectResult objectResult)
-            {
-                var statusCode = objectResult.StatusCode ?? context.HttpContext.Response.StatusCode;
-
-                //是200 并且没有包装  那么包装结果
-                if (statusCode == 200 && !(objectResult.Value is IResponseOutput))
-                {
-                    //if (objectResult.Value == null)
-                    //{
-                    //    var apiResponse = ResponseOutput.DBNotExist();
-
-                    //    objectResult.Value = apiResponse;
-                    //    objectResult.DeclaredType = apiResponse.GetType();
-                    //}
-                    //else
-                    //{
-
-                    var type = objectResult.Value?.GetType();
-
-
-                    if (  type!=null&& type.IsGenericType&&(type.GetGenericTypeDefinition()==typeof(ValueTuple<,>)|| type.GetGenericTypeDefinition()==typeof(Tuple<,>)))
-                    {
-
-                        //报错
-                        //var tuple = (object, object))objectResult.Value;
-
-                        //var (val1, val2) = ((dynamic, dynamic))objectResult.Value;
-                        //var apiResponse = ResponseOutput.Ok(val1, val2);
-
-                        //OK
-                        var tuple = (dynamic)objectResult.Value;
-                        var apiResponse = ResponseOutput.Ok(tuple.Item1, tuple.Item2);
-
-
-                        objectResult.Value = apiResponse;
-                        objectResult.DeclaredType = apiResponse.GetType();
-                    }
-                    else
-                    {
-                        var apiResponse = ResponseOutput.Ok(objectResult.Value);
-
-                        objectResult.Value = apiResponse;
-                        objectResult.DeclaredType = apiResponse.GetType();
-                    }
-
-                      
-                    //}
-                   
-                }
-                //如果不是200  是IResponseOutput  不处理
-                else if (statusCode != 200 && (objectResult.Value is IResponseOutput))
-                {
-                }
-
-                else if(statusCode != 200&&!(objectResult.Value is IResponseOutput))
-                {
-                //---程序错误，请联系开发人员。
-                    var apiResponse = ResponseOutput.NotOk(I18n.T("UnifiedAPI_ProgramError"));
-
-                    objectResult.Value = apiResponse;
-                    objectResult.DeclaredType = apiResponse.GetType();
-                }
-
-            }
-
-            await next.Invoke();
-
-        }
-
-        public static bool IsTupleType(Type type, bool checkBaseTypes = false)
-        {
-            if (type == null)
-                throw new ArgumentNullException(nameof(type));
-
-            if (type == typeof(Tuple))
-                return true;
-
-            while (type != null)
-            {
-                if (type.IsGenericType)
-                {
-                    var genType = type.GetGenericTypeDefinition();
-                    if (genType == typeof(Tuple<>)
-                        || genType == typeof(Tuple<,>)
-                        || genType == typeof(Tuple<,>))
-                        return true;
-                }
-
-                if (!checkBaseTypes)
-                    break;
-
-                type = type.BaseType;
-            }
-
-            return false;
-        }
-    }
-}

IRC.Core.Dicom/HostConfig/AutofacModuleSetup.cs

@@ -1,57 +0,0 @@
-using Autofac;
-using IRaCIS.Core.Infra.EFCore;
-using Microsoft.AspNetCore.Http;
-using Panda.DynamicWebApi;
-using System;
-using System.Linq;
-using System.Reflection;
-using IRaCIS.Core.Domain.Models;
-using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Application.Service;
-using AutoMapper;
-using IRaCIS.Core.SCP.Service;
-
-namespace IRaCIS.Core.SCP
-{
-    // ReSharper disable once IdentifierTypo
-    public class AutofacModuleSetup : Autofac.Module
-    {
-        protected override void Load(ContainerBuilder containerBuilder)
-        {
-
-            #region  byzhouhang  20210917  此处注册泛型仓储 可以减少Domain层 和Infra.EFcore 两层 空的仓储接口定义和 仓储文件定义
-
-            containerBuilder.RegisterGeneric(typeof(Repository<>))
-                .As(typeof(IRepository<>)).InstancePerLifetimeScope();//注册泛型仓储
-
-            containerBuilder.RegisterType<Repository>().As<IRepository>().InstancePerLifetimeScope();
-
-
-            #endregion
-
-            #region 指定控制器也由autofac 来进行实例获取 https://www.cnblogs.com/xwhqwer/p/15320838.html
-
-            //获取所有控制器类型并使用属性注入
-            containerBuilder.RegisterAssemblyTypes(typeof(BaseService).Assembly)
-                .Where(type => typeof(IDynamicWebApi).IsAssignableFrom(type))
-                .PropertiesAutowired();
-
-            #endregion
-
-
-
-            Assembly application = Assembly.LoadFrom(AppDomain.CurrentDomain.BaseDirectory + typeof(BaseService).Assembly.GetName().Name+".dll");
-            containerBuilder.RegisterAssemblyTypes(application).Where(t => t.FullName.Contains("Service"))
-                .PropertiesAutowired().AsImplementedInterfaces();
-
-
-            //containerBuilder.RegisterType<HttpContextAccessor>().As<IHttpContextAccessor>().SingleInstance();
-            //containerBuilder.RegisterType<UserInfo>().As<IUserInfo>().InstancePerLifetimeScope();
-
-
-
-
-
-        }
-    }
-}

IRC.Core.Dicom/HostConfig/EFSetup.cs

@@ -1,64 +0,0 @@
-using EntityFramework.Exceptions.SqlServer;
-using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Infra.EFCore;
-using Medallion.Threading;
-using Medallion.Threading.SqlServer;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Diagnostics;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace IRaCIS.Core.SCP
-{
-    public static class EFSetup
-    {
-        public static void AddEFSetup( this IServiceCollection services, IConfiguration configuration)
-        {
-            services.AddHttpContextAccessor();
-            services.AddScoped<IUserInfo, UserInfo>();
-            services.AddScoped<ISaveChangesInterceptor, AuditEntityInterceptor>();
-
-
-            //这个注入没有成功--注入是没问题的，构造函数也只是支持参数就好，错在注入的地方不能写DbContext
-            //Web程序中通过重用池中DbContext实例可提高高并发场景下的吞吐量， 这在概念上类似于ADO.NET Provider原生的连接池操作方式，具有节省DbContext实例化成本的优点
-            services.AddDbContext<IRaCISDBContext>((sp, options) =>
-            {
-                // 在控制台
-                //public static readonly ILoggerFactory MyLoggerFactory    = LoggerFactory.Create(builder => { builder.AddConsole(); });
-                var logFactory = LoggerFactory.Create(builder => { builder.AddDebug(); });
-
-                options.UseSqlServer(configuration.GetSection("ConnectionStrings:RemoteNew").Value,
-                    contextOptionsBuilder => contextOptionsBuilder.EnableRetryOnFailure());
-
-                options.UseLoggerFactory(logFactory);
-
-                options.UseExceptionProcessor();
-
-                options.EnableSensitiveDataLogging();
-
-                options.AddInterceptors(new QueryWithNoLockDbCommandInterceptor());
-                options.AddInterceptors(sp.GetServices<ISaveChangesInterceptor>());
-
-                options.UseProjectables();
-
-          
-
-            });
-
-            //// Register an additional context factory as a Scoped service, which gets a pooled context from the Singleton factory we registered above,
-            //services.AddScoped<IRaCISDBScopedFactory>();
-
-            //// Finally, arrange for a context to get injected from our Scoped factory:
-            //services.AddScoped(sp => sp.GetRequiredService<IRaCISDBScopedFactory>().CreateDbContext());
-
-            //注意区分 easy caching 也有  IDistributedLockProvider
-            services.AddSingleton<IDistributedLockProvider>(sp =>
-            {
-                //var connection = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]!);
-
-                return new SqlDistributedSynchronizationProvider(configuration.GetSection("ConnectionStrings:RemoteNew").Value);
-            });
-
-        }
-    }
-}

IRC.Core.Dicom/HostConfig/NewtonsoftJsonSetup.cs

@@ -1,59 +0,0 @@
-
-
-using Microsoft.Extensions.DependencyInjection;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System;
-
-namespace IRaCIS.Core.SCP
-{
-    public static class NewtonsoftJsonSetup
-    {
-        public static void AddNewtonsoftJsonSetup(this IMvcBuilder builder, IServiceCollection services)
-        {
-            services.AddHttpContextAccessor();
-            services.AddScoped<IOSSService,OSSService>();
-
-            builder.AddNewtonsoftJson(options =>
-             {
-                 //options.SerializerSettings.PreserveReferencesHandling = PreserveReferencesHandling.Objects;
-                 // 忽略循环引用
-                 options.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
-                 //options.SerializerSettings.TypeNameHandling = TypeNameHandling.All;
-
-                 //处理返回给前端  可空类型 给出默认值 比如in? 为null 设置 默认值0
-                 options.SerializerSettings.ContractResolver = new NullToEmptyStringResolver(); //new DefaultContractResolver();// new NullToEmptyStringResolver();
-                                                                                                // 设置时间格式
-                 options.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";
-
-                 options.SerializerSettings.DateTimeZoneHandling = DateTimeZoneHandling.RoundtripKind;
-
-                 //options.SerializerSettings.Converters.Add(new JSONCustomDateConverter()) ;
-
-                 //options.SerializerSettings.Converters.Add(services.BuildServiceProvider().GetService<JSONTimeZoneConverter>());
-
-
-
-             })
-                .AddControllersAsServices()//动态webApi属性注入需要
-               .ConfigureApiBehaviorOptions(o =>
-                {
-                    o.SuppressModelStateInvalidFilter = true; //自己写验证
-                 
-                });
-
-
-            Newtonsoft.Json.JsonSerializerSettings setting = new Newtonsoft.Json.JsonSerializerSettings();
-            JsonConvert.DefaultSettings = new Func<JsonSerializerSettings>(() =>
-            {
-                //日期类型默认格式化处理
-                setting.DateFormatString = "yyyy-MM-dd HH:mm:ss";
-                setting.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
-
-                return setting;
-            });
-
-
-        }
-    }
-}

IRC.Core.Dicom/HostConfig/NullToEmptyStringResolver.cs

@@ -1,36 +0,0 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace IRaCIS.Core.SCP
-{
-    public class NullToEmptyStringResolver : DefaultContractResolver
-    {
-
-
-        protected override IList<JsonProperty> CreateProperties(Type type, MemberSerialization memberSerialization)
-        {
-            IList<JsonProperty> properties = base.CreateProperties(type, memberSerialization);
-
-            var list= type.GetProperties()
-                .Select(p =>
-                {
-                    var jp = base.CreateProperty(p, memberSerialization);
-                    jp.ValueProvider = new NullToEmptyStringValueProvider(p);
-                    return jp;
-                }).ToList();
-
-            var uu = list.Select(t => t.PropertyName).ToList();
-
-            //获取复杂对象属性
-          properties =   properties.TakeWhile(t => !uu.Contains(t.PropertyName)).ToList();
-
-          list.AddRange(properties);
-          return list;
-        }
-
-
-    }
-}

IRC.Core.Dicom/HostConfig/NullToEmptyStringValueProvider.cs

@@ -1,42 +0,0 @@
-using System;
-using System.Reflection;
-using Newtonsoft.Json.Serialization;
-
-namespace IRaCIS.Core.SCP
-{
-
-    public class NullToEmptyStringValueProvider : IValueProvider
-    {
-        PropertyInfo _MemberInfo;
-        public NullToEmptyStringValueProvider(PropertyInfo memberInfo)
-        {
-            _MemberInfo = memberInfo;
-        }
-        public object GetValue(object target)
-        {
-            object result = _MemberInfo.GetValue(target);
-            if (_MemberInfo.PropertyType == typeof(string) && result == null) result = "";
-            else if (_MemberInfo.PropertyType == typeof(String[]) && result == null) result = new string[] { };
-            //else if (_MemberInfo.PropertyType == typeof(Nullable<Int32>) && result == null) result = 0;
-            else if (_MemberInfo.PropertyType == typeof(Nullable<Decimal>) && result == null) result = 0.00M;
-
-            return result;
-        }
-        public void SetValue(object target, object value)
-        {
-
-            if(_MemberInfo.PropertyType == typeof(string))
-            {
-                //去掉前后空格
-                _MemberInfo.SetValue(target, value==null?string.Empty: value.ToString()==string.Empty? value:value.ToString().Trim());
-              
-            }
-            else
-            {
-                _MemberInfo.SetValue(target, value);
-            }
-          
-        }
-    }
-
-}

IRC.Core.Dicom/IRC.Core.Dicom.csproj

@@ -1,45 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.11" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
-	  <PackageReference Include="AlibabaCloud.SDK.Sts20150401" Version="1.1.5" />
-	  <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.416.8" />
-	  <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.401.81" />
-	  <PackageReference Include="DistributedLock.Core" Version="1.0.8" />
-	  <PackageReference Include="DistributedLock.SqlServer" Version="1.0.6" />
-	  <PackageReference Include="fo-dicom" Version="5.2.1" />
-	  <PackageReference Include="fo-dicom.Codecs" Version="5.16.1" />
-	  <PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.2.1" />
-	  <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="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.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="Swashbuckle.AspNetCore" Version="8.1.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\IRaCIS.Core.Infra.EFCore\IRaCIS.Core.Infra.EFCore.csproj" />
-    <ProjectReference Include="..\IRaCIS.Core.Infrastructure\IRaCIS.Core.Infrastructure.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Helper\" />
-  </ItemGroup>
-
-</Project>

IRC.Core.Dicom/Program.cs

@@ -1,186 +0,0 @@
-
-using Autofac;
-using Autofac.Extensions.DependencyInjection;
-using AutoMapper.EquivalencyExpression;
-using FellowOakDicom;
-using FellowOakDicom.Imaging;
-using FellowOakDicom.Imaging.NativeCodec;
-using FellowOakDicom.Network;
-using IRaCIS.Core.Infra.EFCore;
-using IRaCIS.Core.SCP;
-using IRaCIS.Core.SCP.Filter;
-using IRaCIS.Core.SCP.Service;
-using MassTransit;
-using MassTransit.NewIdProviders;
-using Microsoft.AspNetCore.HttpOverrides;
-using Microsoft.Extensions.DependencyInjection;
-using Panda.DynamicWebApi;
-using Serilog;
-using Serilog.Events;
-using System.Runtime.InteropServices;
-
-
-//以配置文件为准，否则 从url中取环境值(服务以命令行传递参数启动，配置文件配置了就不需要传递环境参数)
-var config = new ConfigurationBuilder()
-            .AddEnvironmentVariables()
-            .Build();
-
-var enviromentName = config["ASPNETCORE_ENVIRONMENT"];
-
-var builder = WebApplication.CreateBuilder(new WebApplicationOptions
-{
-    EnvironmentName = enviromentName
-});
-
-
-
-#region 主机配置
-
-NewId.SetProcessIdProvider(new CurrentProcessIdProvider());
-
-builder.Configuration.AddJsonFile("appsettings.json", false, true)
-                     .AddJsonFile($"appsettings.{enviromentName}.json", false, true);
-builder.Host
-            .UseServiceProviderFactory(new AutofacServiceProviderFactory())
-            .ConfigureContainer<ContainerBuilder>(containerBuilder =>
-            {
-                containerBuilder.RegisterModule<AutofacModuleSetup>();
-            })
-            .UseSerilog();
-#endregion
-
-#region 配置服务
-var _configuration = builder.Configuration;
-
-//健康检查
-builder.Services.AddHealthChecks();
-
-//本地化
-builder.Services.AddJsonLocalization(options => options.ResourcesPath = "Resources");
-
-
-// 异常、参数统一验证过滤器、Json序列化配置、字符串参数绑型统一Trim()
-builder.Services.AddControllers(options =>
-{
-    options.Filters.Add<ModelActionFilter>();
-    options.Filters.Add<ProjectExceptionFilter>();
-    options.Filters.Add<UnitOfWorkFilter>();
-
-
-})
-    .AddNewtonsoftJsonSetup(builder.Services); // NewtonsoftJson 序列化  处理
-
-
-builder.Services.AddOptions().Configure<AliyunOSSOptions>(_configuration.GetSection("AliyunOSS"));
-builder.Services.AddOptions().Configure<ObjectStoreServiceOptions>(_configuration.GetSection("ObjectStoreService"));
-builder.Services.AddOptions().Configure<DicomSCPServiceOption>(_configuration.GetSection("DicomSCPServiceConfig"));
-
-
-//动态WebApi + UnifiedApiResultFilter  省掉控制器代码
-//动态webApi     目前存在的唯一小坑是生成api上服务上的动态代理AOP失效    间接掉用不影响
-builder.Services
-           .AddDynamicWebApi(dynamicWebApiOption =>
-           {
-               //默认是 api
-               dynamicWebApiOption.DefaultApiPrefix = "";
-               //首字母小写
-               dynamicWebApiOption.GetRestFulActionName = (actionName) => char.ToLower(actionName[0]) + actionName.Substring(1);
-               //删除 Service后缀
-               dynamicWebApiOption.RemoveControllerPostfixes.Add("Service");
-
-           });
-
-//AutoMapper
-builder.Services.AddAutoMapper(automapper =>
-{
-
-    automapper.AddCollectionMappers();
-
-
-}, typeof(BaseService).Assembly);
-
-//EF ORM  QueryWithNoLock
-builder.Services.AddEFSetup(_configuration);
-
-builder.Services.AddMediator(cfg =>
-{
-
-});
-
-
-//转发头设置  获取真实IP 
-builder.Services.Configure<ForwardedHeadersOptions>(options =>
-{
-    options.ForwardedHeaders =
-        ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
-});
-
-
-builder.Services.AddFellowOakDicom().AddTranscoderManager<NativeTranscoderManager>()
-              //.AddTranscoderManager<FellowOakDicom.Imaging.NativeCodec.NativeTranscoderManager>()
-              .AddImageManager<ImageSharpImageManager>();
-
-
-
-#endregion
-
-// Add services to the container.
-
-builder.Services.AddControllers();
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
-
-var app = builder.Build();
-
-// Configure the HTTP request pipeline.
-//if (app.Environment.IsDevelopment())
-//{
-app.UseSwagger();
-app.UseSwaggerUI();
-//}
-
-app.UseAuthorization();
-
-app.MapControllers();
-
-#region 日志
-
-
-Log.Logger = new LoggerConfiguration()
-     //.MinimumLevel.Information()
-     .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
-    .WriteTo.Console()
-    .WriteTo.File($"{AppContext.BaseDirectory}Serilogs/.log", rollingInterval: RollingInterval.Day)
-    .CreateLogger();
-
-#endregion
-
-
-#region 运行环境 部署平台
-
-Log.Logger.Warning($"当前环境：{enviromentName}");
-
-if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-{
-    Log.Logger.Warning($"当前部署平台环境：windows");
-}
-else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-{
-    Log.Logger.Warning($"当前部署平台环境：linux");
-}
-else
-{
-    Log.Logger.Warning($"当前部署平台环境：OSX  or FreeBSD");
-}
-
-#endregion
-
-DicomSetupBuilder.UseServiceProvider(app.Services);
-
-var logger = app.Services.GetService<Microsoft.Extensions.Logging.ILogger<Program>>();
-
-var server = DicomServerFactory.Create<CStoreSCPService>(_configuration.GetSection("DicomSCPServiceConfig").GetValue<int>("ServerPort"), userState: app.Services, logger: logger);
-
-
-app.Run();

IRC.Core.Dicom/Properties/launchSettings.json

@@ -1,31 +0,0 @@
-{
-  "$schema": "http://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:11224",
-      "sslPort": 0
-    }
-  },
-  "profiles": {
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:5127",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}

IRC.Core.Dicom/Service/BaseService.cs

@@ -1,111 +0,0 @@
-using AutoMapper;
-using IRaCIS.Core.Application.Service.BusinessFilter;
-using IRaCIS.Core.Infra.EFCore;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Localization;
-using Panda.DynamicWebApi;
-using Panda.DynamicWebApi.Attributes;
-using System.Diagnostics.CodeAnalysis;
-using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Infrastructure.Extention;
-using IRaCIS.Core.Domain.Models;
-
-namespace IRaCIS.Core.SCP.Service
-{
-
-#pragma warning disable CS8618
-
-
-    #region 非泛型版本
-
-    [Authorize, DynamicWebApi, UnifiedApiResultFilter]
-    public class BaseService : IBaseService, IDynamicWebApi
-    {
-        public IMapper _mapper { get; set; }
-
-        public IUserInfo _userInfo { get; set; }
-
-
-        public IStringLocalizer _localizer { get; set; }
-
-        public IWebHostEnvironment _hostEnvironment { get; set; }
-
-
-
-
-        public static IResponseOutput Null404NotFound<TEntity>(TEntity? businessObject) where TEntity : class
-        {
-            return new ResponseOutput<string>()
-            .NotOk($"The query object {typeof(TEntity).Name} does not exist , or was deleted by someone else, or an incorrect parameter query caused", code: ApiResponseCodeEnum.DataNotExist);
-        }
-    }
-
-
-    public interface IBaseService
-    {
-        [MemberNotNull(nameof(_mapper))]
-        public IMapper _mapper { get; set; }
-
-        [MemberNotNull(nameof(_userInfo))]
-        public IUserInfo _userInfo { get; set; }
-
-        [MemberNotNull(nameof(_localizer))]
-        public IStringLocalizer _localizer { get; set; }
-
-        [MemberNotNull(nameof(_hostEnvironment))]
-        public IWebHostEnvironment _hostEnvironment { get; set; }
-
-    }
-    #endregion
-
-
-    #region 泛型版本测试
-
-
-    public interface IBaseServiceTest<T> where T : Entity
-    {
-        [MemberNotNull(nameof(_mapper))]
-        public IMapper _mapper { get; set; }
-
-        [MemberNotNull(nameof(_userInfo))]
-        public IUserInfo _userInfo { get; set; }
-
-
-
-        [MemberNotNull(nameof(_localizer))]
-        public IStringLocalizer _localizer { get; set; }
-
-
-
-    }
-
-
-    [Authorize, DynamicWebApi, UnifiedApiResultFilter]
-    public class BaseServiceTest<T> : IBaseServiceTest<T>, IDynamicWebApi where T : Entity
-    {
-        public IMapper _mapper { get; set; }
-
-        public IUserInfo _userInfo { get; set; }
-
-        public IStringLocalizer _localizer { get; set; }
-
-        public static IResponseOutput Null404NotFound<TEntity>(TEntity? businessObject) where TEntity : class
-        {
-            return new ResponseOutput<string>()
-            .NotOk($"The query object {typeof(TEntity).Name} does not exist , or was deleted by someone else, or an incorrect parameter query caused", code: ApiResponseCodeEnum.DataNotExist);
-        }
-
-
-    }
-
-
-    #endregion
-
-
-
-
-
-
-
-}

IRC.Core.Dicom/Service/CStoreSCPService.cs

@@ -1,376 +0,0 @@
-using FellowOakDicom.Network;
-using FellowOakDicom;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using IRaCIS.Core.SCP.Service;
-using IRaCIS.Core.Domain.Models;
-using IRaCIS.Core.Infra.EFCore;
-using Medallion.Threading;
-using IRaCIS.Core.Domain.Share;
-using Serilog;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
-using Microsoft.Extensions.Options;
-using System.Data;
-using FellowOakDicom.Imaging;
-using SharpCompress.Common;
-using SixLabors.ImageSharp.Formats.Jpeg;
-using IRaCIS.Core.Infrastructure;
-
-namespace IRaCIS.Core.SCP.Service
-{
-
-    public class DicomSCPServiceOption
-    {
-        public List<string> CalledAEList { get; set; }
-
-        public string ServerPort { get; set; }
-    }
-
-
-
-
-    public class CStoreSCPService : DicomService, IDicomServiceProvider, IDicomCStoreProvider, IDicomCEchoProvider
-    {
-        private IServiceProvider _serviceProvider { get; set; }
-
-        private List<Guid> _SCPStudyIdList { get; set; } = new List<Guid>();
-
-        private SCPImageUpload _upload { get; set; }
-
-        private Guid _trialId { get; set; }
-
-        private Guid _trialSiteId { get; set; }
-
-
-
-        private static readonly DicomTransferSyntax[] _acceptedTransferSyntaxes = new DicomTransferSyntax[]
-        {
-               DicomTransferSyntax.ExplicitVRLittleEndian,
-               DicomTransferSyntax.ExplicitVRBigEndian,
-               DicomTransferSyntax.ImplicitVRLittleEndian
-        };
-
-        private static readonly DicomTransferSyntax[] _acceptedImageTransferSyntaxes = new DicomTransferSyntax[]
-        {
-                // Lossless
-               DicomTransferSyntax.JPEGLSLossless,   //1.2.840.10008.1.2.4.80
-               DicomTransferSyntax.JPEG2000Lossless, //1.2.840.10008.1.2.4.90
-               DicomTransferSyntax.JPEGProcess14SV1, //1.2.840.10008.1.2.4.70
-               DicomTransferSyntax.JPEGProcess14,    //1.2.840.10008.1.2.4.57 JPEG Lossless, Non-Hierarchical (Process 14)
-               DicomTransferSyntax.RLELossless,      //1.2.840.10008.1.2.5
-               // Lossy
-               DicomTransferSyntax.JPEGLSNearLossless,//1.2.840.10008.1.2.4.81"
-               DicomTransferSyntax.JPEG2000Lossy,     //1.2.840.10008.1.2.4.91
-               DicomTransferSyntax.JPEGProcess1,      //1.2.840.10008.1.2.4.50
-               DicomTransferSyntax.JPEGProcess2_4,    //1.2.840.10008.1.2.4.51
-               // Uncompressed
-               DicomTransferSyntax.ExplicitVRLittleEndian, //1.2.840.10008.1.2.1
-               DicomTransferSyntax.ExplicitVRBigEndian,    //1.2.840.10008.1.2.2
-               DicomTransferSyntax.ImplicitVRLittleEndian  //1.2.840.10008.1.2
-        };
-
-
-        public CStoreSCPService(INetworkStream stream, Encoding fallbackEncoding, Microsoft.Extensions.Logging.ILogger log, DicomServiceDependencies dependencies, IServiceProvider injectServiceProvider)
-            : base(stream, fallbackEncoding, log, dependencies)
-        {
-            _serviceProvider = injectServiceProvider.CreateScope().ServiceProvider;
-        }
-
-
-
-
-        public Task OnReceiveAssociationRequestAsync(DicomAssociation association)
-        {
-
-            _upload = new SCPImageUpload() { StartTime = DateTime.Now, CallingAE = association.CallingAE, CalledAE = association.CalledAE, CallingAEIP = association.RemoteHost };
-
-
-            Log.Logger.Warning($"接收到来自{association.CallingAE}的连接");
-
-            //_serviceProvider = (IServiceProvider)this.UserState;
-
-            var _trialDicomAERepository = _serviceProvider.GetService<IRepository<TrialDicomAE>>();
-
-
-            var trialDicomAEList = _trialDicomAERepository.Select(t => new { t.CalledAE, t.TrialId }).ToList();
-            var trialCalledAEList = trialDicomAEList.Select(t => t.CalledAE).ToList();
-
-            Log.Logger.Information("当前系统配置：", string.Join('|', trialDicomAEList));
-
-            var findCalledAE = trialDicomAEList.Where(t => t.CalledAE == association.CalledAE).FirstOrDefault();
-
-            var isCanReceiveIamge = false;
-
-            if (findCalledAE != null)
-            {
-                _trialId = findCalledAE.TrialId;
-
-                var _trialSiteDicomAERepository = _serviceProvider.GetService<IRepository<TrialSiteDicomAE>>();
-
-
-                var findTrialSiteAE = _trialSiteDicomAERepository.Where(t => t.CallingAE == association.CallingAE && t.TrialId==_trialId).FirstOrDefault();
-
-                if (findTrialSiteAE != null)
-                {
-                    _trialSiteId = findTrialSiteAE.TrialSiteId;
-
-                    isCanReceiveIamge = true;
-                }
-
-               
-            }
-
-            if (association.CallingAE == "test-callingAE")
-            {
-                isCanReceiveIamge = true;
-            }
-
-            if (!trialCalledAEList.Contains(association.CalledAE) || isCanReceiveIamge == false)
-            {
-
-                Log.Logger.Warning($"拒绝CallingAE:{association.CallingAE}  CalledAE:{association.CalledAE}的连接");
-
-                return SendAssociationRejectAsync(
-                    DicomRejectResult.Permanent,
-                    DicomRejectSource.ServiceUser,
-                    DicomRejectReason.CalledAENotRecognized);
-            }
-
-            foreach (var pc in association.PresentationContexts)
-            {
-                if (pc.AbstractSyntax == DicomUID.Verification)
-                {
-                    pc.AcceptTransferSyntaxes(_acceptedTransferSyntaxes);
-                }
-                else if (pc.AbstractSyntax.StorageCategory != DicomStorageCategory.None)
-                {
-                    pc.AcceptTransferSyntaxes(_acceptedImageTransferSyntaxes);
-                }
-            }
-
-
-
-            return SendAssociationAcceptAsync(association);
-        }
-
-
-        public async Task OnReceiveAssociationReleaseRequestAsync()
-        {
-            await DataMaintenanceAsaync();
-
-            //记录监控
-
-            var _SCPImageUploadRepository = _serviceProvider.GetService<IRepository<SCPImageUpload>>();
-
-            _upload.EndTime = DateTime.Now;
-            _upload.StudyCount = _SCPStudyIdList.Count;
-            _upload.TrialId = _trialId;
-            _upload.TrialSiteId = _trialSiteId;
-
-            await _SCPImageUploadRepository.AddAsync(_upload, true);
-
-
-            var _studyRepository = _serviceProvider.GetService<IRepository<SCPStudy>>();
-            //将检查设置为传输结束
-            await _studyRepository.BatchUpdateNoTrackingAsync(t => _SCPStudyIdList.Contains(t.Id), u => new SCPStudy() { IsUploadFinished = true });
-
-            await _studyRepository.SaveChangesAndClearAllTrackingAsync();
-
-            await SendAssociationReleaseResponseAsync();
-        }
-
-
-        private async Task DataMaintenanceAsaync()
-        {
-            Log.Logger.Warning($"CallingAE:{Association.CallingAE} CalledAE:{Association.CalledAE}传输结束：开始维护数据，处理检查Modality");
-
-
-
-            //处理检查Modality
-            var _dictionaryRepository = _serviceProvider.GetService<IRepository<Dictionary>>();
-            var _seriesRepository = _serviceProvider.GetService<IRepository<SCPSeries>>();
-            var _studyRepository = _serviceProvider.GetService<IRepository<SCPStudy>>();
-
-            var dicModalityList = _dictionaryRepository.Where(t => t.Code == "Modality").SelectMany(t => t.ChildList.Select(c => c.Value)).ToList();
-            var seriesModalityList = _seriesRepository.Where(t => _SCPStudyIdList.Contains(t.StudyId)).Select(t => new { SCPStudyId = t.StudyId, t.Modality }).ToList();
-
-            foreach (var g in seriesModalityList.GroupBy(t => t.SCPStudyId))
-            {
-                var modality = string.Join('、', g.Select(t => t.Modality).Distinct().ToList());
-
-                //特殊逻辑
-                var modalityForEdit = dicModalityList.Contains(modality) ? modality : String.Empty;
-
-                if (modality == "MR")
-                {
-                    modalityForEdit = "MRI";
-                }
-
-                if (modality == "PT")
-                {
-                    modalityForEdit = "PET";
-                }
-                if (modality == "PT、CT" || modality == "CT、PT")
-                {
-                    modalityForEdit = "PET-CT";
-                }
-
-                await _studyRepository.BatchUpdateNoTrackingAsync(t => t.Id == g.Key, u => new SCPStudy() { Modalities = modality, ModalityForEdit = modalityForEdit });
-
-            }
-
-            Log.Logger.Warning($"CallingAE:{Association.CallingAE} CalledAE:{Association.CalledAE}维护数据结束");
-        }
-
-        public void OnReceiveAbort(DicomAbortSource source, DicomAbortReason reason)
-        {
-            Log.Logger.Warning($"CallingAE:{Association.CallingAE} CalledAE:{Association.CalledAE}接收中断，中断原因：{source.ToString() + reason.ToString()}");
-            /* nothing to do here */
-        }
-
-
-        public async void OnConnectionClosed(Exception exception)
-        {
-            /* nothing to do here */
-
-            //奇怪的bug  上传的时候，用王捷修改的影像，会关闭，重新连接，导致检查id 丢失，然后状态不一致
-            if (exception == null)
-            {
-                //var _studyRepository = _serviceProvider.GetService<IRepository<SCPStudy>>();
-                ////将检查设置为传输结束
-                //await _studyRepository.BatchUpdateNoTrackingAsync(t => _SCPStudyIdList.Contains(t.Id), u => new SCPStudy() { IsUploadFinished = true });
-
-                //await _studyRepository.SaveChangesAndClearAllTrackingAsync();
-            }
-
-            Log.Logger.Warning($"连接关闭 {exception?.Message} {exception?.InnerException?.Message}");
-        }
-
-
-
-
-        public async Task<DicomCStoreResponse> OnCStoreRequestAsync(DicomCStoreRequest request)
-        {
-
-            string studyInstanceUid = request.Dataset.GetString(DicomTag.StudyInstanceUID);
-            string seriesInstanceUid = request.Dataset.GetString(DicomTag.SeriesInstanceUID);
-            string sopInstanceUid = request.Dataset.GetString(DicomTag.SOPInstanceUID);
-
-            //Guid studyId = IdentifierHelper.CreateGuid(studyInstanceUid, trialId.ToString());
-            Guid seriesId = IdentifierHelper.CreateGuid(studyInstanceUid, seriesInstanceUid, _trialId.ToString());
-            Guid instanceId = IdentifierHelper.CreateGuid(studyInstanceUid, seriesInstanceUid, sopInstanceUid, _trialId.ToString());
-
-
-            var ossService = _serviceProvider.GetService<IOSSService>();
-            var dicomArchiveService = _serviceProvider.GetService<IDicomArchiveService>();
-            var _seriesRepository = _serviceProvider.GetService<IRepository<SCPSeries>>();
-
-            var _distributedLockProvider = _serviceProvider.GetService<IDistributedLockProvider>();
-
-            var storeRelativePath = string.Empty;
-            var ossFolderPath = $"{_trialId}/Image/PACS/{_trialSiteId}/{studyInstanceUid}";
-
-
-            long fileSize = 0;
-            try
-            {
-
-                using (MemoryStream ms = new MemoryStream())
-                {
-                    await request.File.SaveAsync(ms);
-
-                    //irc 从路径最后一截取Guid
-                    storeRelativePath = await ossService.UploadToOSSAsync(ms, ossFolderPath, instanceId.ToString(), false);
-
-                    fileSize = ms.Length;
-                }
-
-                Log.Logger.Information($"CallingAE:{Association.CallingAE} CalledAE:{Association.CalledAE} {request.SOPInstanceUID} 上传完成 ");
-
-            }
-            catch (Exception ec)
-            {
-                Log.Logger.Warning($"CallingAE:{Association.CallingAE} CalledAE:{Association.CalledAE} 上传异常 {ec.Message}");
-            }
-
-
-
-            var @lock = _distributedLockProvider.CreateLock($"{studyInstanceUid}");
-
-            using (await @lock.AcquireAsync())
-            {
-                try
-                {
-                    var scpStudyId = await dicomArchiveService.ArchiveDicomFileAsync(request.Dataset, _trialId, _trialSiteId, storeRelativePath, Association.CallingAE, Association.CalledAE,fileSize);
-
-                    if (!_SCPStudyIdList.Contains(scpStudyId))
-                    {
-                        _SCPStudyIdList.Add(scpStudyId);
-                    }
-
-                    var series = await _seriesRepository.FirstOrDefaultAsync(t => t.Id == seriesId);
-
-                    //没有缩略图
-                    if (series != null && string.IsNullOrEmpty(series.ImageResizePath))
-                    {
-
-                        // 生成缩略图
-                        using (var memoryStream = new MemoryStream())
-                        {
-                            DicomImage image = new DicomImage(request.Dataset);
-
-                            var sharpimage = image.RenderImage().AsSharpImage();
-                            sharpimage.Save(memoryStream, new JpegEncoder());
-
-                            // 上传缩略图到 OSS
-
-                            var seriesPath = await ossService.UploadToOSSAsync(memoryStream, ossFolderPath, seriesId.ToString() + ".preview.jpg", false);
-
-                            Console.WriteLine(seriesPath + "  Id:  " + seriesId);
-
-                            series.ImageResizePath = seriesPath;
-
-                        }
-                    }
-
-
-                    await _seriesRepository.SaveChangesAsync();
-                }
-                catch (Exception ex)
-                {
-
-                    Log.Logger.Warning($"CallingAE:{Association.CallingAE} CalledAE:{Association.CalledAE} 传输处理异常：{ex.ToString()}");
-
-                }
-
-            }
-
-
-
-            //监控信息设置
-            _upload.FileCount++;
-            _upload.FileSize = _upload.FileSize + fileSize;
-            return new DicomCStoreResponse(request, DicomStatus.Success);
-        }
-
-
-        public Task OnCStoreRequestExceptionAsync(string tempFileName, Exception e)
-        {
-            // let library handle logging and error response
-            return Task.CompletedTask;
-        }
-
-
-        public Task<DicomCEchoResponse> OnCEchoRequestAsync(DicomCEchoRequest request)
-        {
-            return Task.FromResult(new DicomCEchoResponse(request, DicomStatus.Success));
-        }
-
-    }
-}

IRC.Core.Dicom/Service/DicomArchiveService.cs

@@ -1,356 +0,0 @@
-using IRaCIS.Core.Domain.Share;
-using System.Text;
-using Microsoft.AspNetCore.Hosting;
-using IRaCIS.Core.Infrastructure;
-using Medallion.Threading;
-using FellowOakDicom;
-using FellowOakDicom.Imaging.Codec;
-using System.Data;
-using IRaCIS.Core.Domain.Models;
-using FellowOakDicom.Network;
-using IRaCIS.Core.SCP.Service;
-using IRaCIS.Core.Infra.EFCore;
-using MassTransit;
-using System.Runtime.Intrinsics.X86;
-using Serilog.Sinks.File;
-
-namespace IRaCIS.Core.SCP.Service
-{
-    public class DicomArchiveService : BaseService, IDicomArchiveService
-    {
-        private readonly IRepository<SCPPatient> _patientRepository;
-        private readonly IRepository<SCPStudy> _studyRepository;
-        private readonly IRepository<SCPSeries> _seriesRepository;
-        private readonly IRepository<SCPInstance> _instanceRepository;
-        private readonly IRepository<Dictionary> _dictionaryRepository;
-        private readonly IDistributedLockProvider _distributedLockProvider;
-
-
-        private List<Guid> _instanceIdList = new List<Guid>();
-
-        public DicomArchiveService(IRepository<SCPPatient> patientRepository, IRepository<SCPStudy> studyRepository,
-            IRepository<SCPSeries> seriesRepository,
-            IRepository<SCPInstance> instanceRepository,
-            IRepository<Dictionary> dictionaryRepository,
-            IDistributedLockProvider distributedLockProvider)
-        {
-            _distributedLockProvider = distributedLockProvider;
-            _studyRepository = studyRepository;
-            _patientRepository = patientRepository;
-            _seriesRepository = seriesRepository;
-            _instanceRepository = instanceRepository;
-            _dictionaryRepository = dictionaryRepository;
-
-        }
-
-
-
-
-        /// <summary>
-        /// 单个文件接收 归档
-        /// </summary>
-        /// <param name="dataset"></param>
-        /// <returns></returns>
-        /// <exception cref="NotImplementedException"></exception>
-        public async Task<Guid> ArchiveDicomFileAsync(DicomDataset dataset, Guid trialId, Guid trialSiteId, string fileRelativePath, string callingAE, string calledAE,long fileSize)
-        {
-            string studyInstanceUid = dataset.GetString(DicomTag.StudyInstanceUID);
-            string seriesInstanceUid = dataset.GetString(DicomTag.SeriesInstanceUID);
-            string sopInstanceUid = dataset.GetString(DicomTag.SOPInstanceUID);
-
-            string patientIdStr = dataset.GetSingleValueOrDefault(DicomTag.PatientID,string.Empty);
-
-            //Guid patientId= IdentifierHelper.CreateGuid(patientIdStr);
-            Guid studyId = IdentifierHelper.CreateGuid(studyInstanceUid,trialId.ToString());
-            Guid seriesId = IdentifierHelper.CreateGuid(studyInstanceUid, seriesInstanceUid, trialId.ToString());
-            Guid instanceId = IdentifierHelper.CreateGuid(studyInstanceUid, seriesInstanceUid, sopInstanceUid, trialId.ToString());
-
-            var isStudyNeedAdd = false;
-            var isSeriesNeedAdd = false;
-            var isInstanceNeedAdd = false;
-            var isPatientNeedAdd = false;
-
-            //var @lock = _distributedLockProvider.CreateLock($"{studyInstanceUid}");
-
-            //using (@lock.Acquire())
-            {
-                var findPatient = await _patientRepository.FirstOrDefaultAsync(t => t.PatientIdStr == patientIdStr && t.TrialSiteId==trialSiteId );
-                var findStudy = await _studyRepository.FirstOrDefaultAsync(t=>t.Id== studyId);
-                var findSerice = await _seriesRepository.FirstOrDefaultAsync(t => t.Id ==   seriesId);
-                var findInstance = await _instanceRepository.FirstOrDefaultAsync(t => t.Id == instanceId);
-
-                DateTime? studyTime = dataset.GetSingleValueOrDefault(DicomTag.StudyDate, string.Empty) == string.Empty ? null : dataset.GetSingleValue<DateTime>(DicomTag.StudyDate).Add(dataset.GetSingleValueOrDefault(DicomTag.StudyTime, string.Empty) == string.Empty ? TimeSpan.Zero : dataset.GetSingleValue<DateTime>(DicomTag.StudyTime).TimeOfDay);
-
-                //先传输了修改了患者编号的，又传输了没有修改患者编号的，导致后传输的没有修改患者编号的下面的检查为0
-                if (findPatient == null && findStudy==null)
-                {
-                    isPatientNeedAdd = true;
-
-
-                    findPatient = new SCPPatient()
-                    {
-                        Id = NewId.NextSequentialGuid(),
-                        TrialId=trialId,
-                        TrialSiteId=trialSiteId,
-                        PatientIdStr = dataset.GetSingleValueOrDefault(DicomTag.PatientID, string.Empty),
-                        PatientName = dataset.GetSingleValueOrDefault(DicomTag.PatientName, string.Empty),
-                        PatientAge = dataset.GetSingleValueOrDefault(DicomTag.PatientAge, string.Empty),
-                        PatientSex = dataset.GetSingleValueOrDefault(DicomTag.PatientSex, string.Empty),
-                        PatientBirthDate = dataset.GetSingleValueOrDefault(DicomTag.PatientBirthDate, string.Empty),
-
-                        EarliestStudyTime = studyTime,
-                        LatestStudyTime = studyTime,
-                        LatestPushTime = DateTime.Now,
-                    };
-
-                    if (findPatient.PatientBirthDate.Length == 8)
-                    {
-                        var birthDateStr = $"{findPatient.PatientBirthDate[0]}{findPatient.PatientBirthDate[1]}{findPatient.PatientBirthDate[2]}{findPatient.PatientBirthDate[3]}-{findPatient.PatientBirthDate[4]}{findPatient.PatientBirthDate[5]}-{findPatient.PatientBirthDate[6]}{findPatient.PatientBirthDate[7]}";
-
-                        var yearStr = $"{findPatient.PatientBirthDate[0]}{findPatient.PatientBirthDate[1]}{findPatient.PatientBirthDate[2]}{findPatient.PatientBirthDate[3]}";
-
-                        int year = 0;
-
-                        var canParse = int.TryParse(yearStr, out year);
-
-                        if (canParse && year > 1900)
-                        {
-                            findPatient.PatientBirthDate = birthDateStr;
-
-                            DateTime birthDate;
-
-                            if (findPatient.PatientAge == string.Empty && studyTime.HasValue && DateTime.TryParse(findPatient.PatientBirthDate,out birthDate))
-                            {
-                                var patientAge = studyTime.Value.Year - birthDate.Year;
-                                // 如果生日还未到，年龄减去一岁
-                                if (studyTime.Value < birthDate.AddYears(patientAge))
-                                {
-                                    patientAge--;
-                                }
-
-                                findPatient.PatientAge = patientAge.ToString();
-                            }
-
-                        }
-                        else
-                        {
-                            findPatient.PatientBirthDate = string.Empty;
-                        }
-
-                    }
-                }
-                else
-                {
-                    if (studyTime < findPatient.EarliestStudyTime)
-                    {
-                        findPatient.EarliestStudyTime = studyTime;
-                    }
-                    if (studyTime > findPatient.LatestStudyTime)
-                    {
-                        findPatient.LatestStudyTime = studyTime;
-                    }
-
-                    findPatient.LatestPushTime = DateTime.Now;
-                }
-
-                if (findStudy == null)
-                {
-                    isStudyNeedAdd = true;
-                    findStudy = new SCPStudy
-                    {
-                        CalledAE = calledAE,
-                        CallingAE = callingAE,
-
-                        PatientId = findPatient.Id,
-                        Id = studyId,
-                        TrialId = trialId,
-                        TrialSiteId = trialSiteId,
-                        StudyInstanceUid = studyInstanceUid,
-                        StudyTime = studyTime,
-                        Modalities = dataset.GetSingleValueOrDefault(DicomTag.Modality, string.Empty),
-                        //ModalityForEdit = modalityForEdit,
-                        Description = dataset.GetSingleValueOrDefault(DicomTag.StudyDescription, string.Empty),
-                        InstitutionName = dataset.GetSingleValueOrDefault(DicomTag.InstitutionName, string.Empty),
-                        PatientIdStr = dataset.GetSingleValueOrDefault(DicomTag.PatientID, string.Empty),
-                        PatientName = dataset.GetSingleValueOrDefault(DicomTag.PatientName, string.Empty),
-                        PatientAge = dataset.GetSingleValueOrDefault(DicomTag.PatientAge, string.Empty),
-                        PatientSex = dataset.GetSingleValueOrDefault(DicomTag.PatientSex, string.Empty),
-                        BodyPartExamined = dataset.GetSingleValueOrDefault(DicomTag.BodyPartExamined, string.Empty),
-
-                        StudyId = dataset.GetSingleValueOrDefault(DicomTag.StudyID, string.Empty),
-                        AccessionNumber = dataset.GetSingleValueOrDefault(DicomTag.AccessionNumber, string.Empty),
-
-                        //需要特殊处理
-                        PatientBirthDate = dataset.GetSingleValueOrDefault(DicomTag.PatientBirthDate, string.Empty),
-
-
-                        AcquisitionTime = dataset.GetSingleValueOrDefault(DicomTag.AcquisitionTime, string.Empty),
-                        AcquisitionNumber = dataset.GetSingleValueOrDefault(DicomTag.AcquisitionNumber, string.Empty),
-                        TriggerTime = dataset.GetSingleValueOrDefault(DicomTag.TriggerTime, string.Empty),
-
-
-
-                        //IsDoubleReview = addtionalInfo.IsDoubleReview,
-                        SeriesCount = 0,
-                        InstanceCount = 0
-                    };
-
-
-                    if (findStudy.PatientBirthDate.Length == 8)
-                    {
-                        findStudy.PatientBirthDate = $"{findStudy.PatientBirthDate[0]}{findStudy.PatientBirthDate[1]}{findStudy.PatientBirthDate[2]}{findStudy.PatientBirthDate[3]}-{findStudy.PatientBirthDate[4]}{findStudy.PatientBirthDate[5]}-{findStudy.PatientBirthDate[6]}{findStudy.PatientBirthDate[7]}";
-                    }
-                }
-
-
-                if (findSerice == null)
-                {
-                    isSeriesNeedAdd = true;
-
-                    findSerice = new SCPSeries
-                    {
-                        Id = seriesId,
-                        StudyId = findStudy.Id,
-
-                        StudyInstanceUid = findStudy.StudyInstanceUid,
-                        SeriesInstanceUid = seriesInstanceUid,
-                        SeriesNumber = dataset.GetSingleValueOrDefault(DicomTag.SeriesNumber, 1),
-                        //SeriesTime = dataset.GetSingleValueOrDefault(DicomTag.SeriesDate, DateTime.Now).Add(dataset.GetSingleValueOrDefault(DicomTag.SeriesTime, DateTime.Now).TimeOfDay),
-                        //SeriesTime = DateTime.TryParse(dataset.GetSingleValue<string>(DicomTag.SeriesDate) + dataset.GetSingleValue<string>(DicomTag.SeriesTime), out DateTime dt) ? dt : null,
-                        SeriesTime = dataset.GetSingleValueOrDefault(DicomTag.SeriesDate, string.Empty) == string.Empty ? null : dataset.GetSingleValue<DateTime>(DicomTag.SeriesDate).Add(dataset.GetSingleValueOrDefault(DicomTag.SeriesTime, string.Empty) == string.Empty ? TimeSpan.Zero : dataset.GetSingleValue<DateTime>(DicomTag.SeriesTime).TimeOfDay),
-                        Modality = dataset.GetSingleValueOrDefault(DicomTag.Modality, string.Empty),
-                        Description = dataset.GetSingleValueOrDefault(DicomTag.SeriesDescription, string.Empty),
-                        SliceThickness = dataset.GetSingleValueOrDefault(DicomTag.SliceThickness, string.Empty),
-
-                        ImagePositionPatient = dataset.GetSingleValueOrDefault(DicomTag.ImagePositionPatient, string.Empty),
-                        ImageOrientationPatient = dataset.GetSingleValueOrDefault(DicomTag.ImageOrientationPatient, string.Empty),
-                        BodyPartExamined = dataset.GetSingleValueOrDefault(DicomTag.BodyPartExamined, string.Empty),
-                        SequenceName = dataset.GetSingleValueOrDefault(DicomTag.SequenceName, string.Empty),
-                        ProtocolName = dataset.GetSingleValueOrDefault(DicomTag.ProtocolName, string.Empty),
-                        ImagerPixelSpacing = dataset.GetSingleValueOrDefault(DicomTag.ImagerPixelSpacing, string.Empty),
-
-                        AcquisitionTime = dataset.GetSingleValueOrDefault(DicomTag.AcquisitionTime, string.Empty),
-                        AcquisitionNumber = dataset.GetSingleValueOrDefault(DicomTag.AcquisitionNumber, string.Empty),
-                        TriggerTime = dataset.GetSingleValueOrDefault(DicomTag.TriggerTime, string.Empty),
-
-
-                        InstanceCount = 0
-                    };
-
-                    ++findStudy.SeriesCount;
-                }
-
-
-                if (findInstance == null)
-                {
-                    isInstanceNeedAdd = true;
-                    findInstance = new SCPInstance
-                    {
-                        Id = instanceId,
-                        StudyId = findStudy.Id,
-                        SeriesId = findSerice.Id,
-                        StudyInstanceUid = findStudy.StudyInstanceUid,
-                        SeriesInstanceUid = findSerice.SeriesInstanceUid,
-
-                        SopInstanceUid = sopInstanceUid,
-                        InstanceNumber = dataset.GetSingleValueOrDefault(DicomTag.InstanceNumber, 1),
-                        InstanceTime = dataset.GetSingleValueOrDefault(DicomTag.ContentDate, string.Empty) == string.Empty ? null : dataset.GetSingleValue<DateTime>(DicomTag.ContentDate).Add(dataset.GetSingleValueOrDefault(DicomTag.ContentTime, string.Empty) == string.Empty ? TimeSpan.Zero : dataset.GetSingleValue<DateTime>(DicomTag.ContentTime).TimeOfDay),
-                        //InstanceTime = DateTime.TryParse(dataset.GetSingleValue<string>(DicomTag.ContentDate) + dataset.GetSingleValue<string>(DicomTag.ContentTime), out DateTime dt) ? dt : null,
-                        //InstanceTime = dataset.GetSingleValueOrDefault(DicomTag.ContentDate,(DateTime?)null)?.Add(dataset.GetSingleValueOrDefault(DicomTag.ContentTime, TimeSpan.Zero)),
-                        //dataset.GetSingleValueOrDefault(DicomTag.ContentDate,DateTime.Now);//, DicomTag.ContentTime)
-                        CPIStatus = false,
-                        ImageRows = dataset.GetSingleValueOrDefault(DicomTag.Rows, 0),
-                        ImageColumns = dataset.GetSingleValueOrDefault(DicomTag.Columns, 0),
-                        SliceLocation = dataset.GetSingleValueOrDefault(DicomTag.SliceLocation, 0),
-
-                        SliceThickness = dataset.GetSingleValueOrDefault(DicomTag.SliceThickness, string.Empty),
-                        NumberOfFrames = dataset.GetSingleValueOrDefault(DicomTag.NumberOfFrames, 0),
-                        PixelSpacing = dataset.GetSingleValueOrDefault(DicomTag.PixelSpacing, string.Empty),
-                        ImagerPixelSpacing = dataset.GetSingleValueOrDefault(DicomTag.ImagerPixelSpacing, string.Empty),
-                        FrameOfReferenceUID = dataset.GetSingleValueOrDefault(DicomTag.FrameOfReferenceUID, string.Empty),
-                        WindowCenter = dataset.GetSingleValueOrDefault(DicomTag.WindowCenter, string.Empty),
-                        WindowWidth = dataset.GetSingleValueOrDefault(DicomTag.WindowWidth, string.Empty),
-
-                        Path = fileRelativePath,
-
-                        FileSize= fileSize,
-
-                    };
-
-                    ++findStudy.InstanceCount;
-                    ++findSerice.InstanceCount;
-                }
-
-                if (isPatientNeedAdd)
-                {
-                    var ss = await _patientRepository.AddAsync(findPatient);
-                }
-                if (isStudyNeedAdd)
-                {
-                    var dd = await _studyRepository.AddAsync(findStudy);
-                }
-                else
-                {
-                    await _studyRepository.BatchUpdateNoTrackingAsync(t => t.Id == findStudy.Id, t => new SCPStudy() { IsUploadFinished = false });
-                }
-
-                if (isSeriesNeedAdd)
-                {
-                    await _seriesRepository.AddAsync(findSerice);
-                }
-                if (isInstanceNeedAdd)
-                {
-                    await _instanceRepository.AddAsync(findInstance);
-                }
-                else
-                {
-                    await _instanceRepository.BatchUpdateNoTrackingAsync(t => t.Id == instanceId, u => new SCPInstance() { Path = fileRelativePath,FileSize=fileSize });
-                }
-
-                await _studyRepository.SaveChangesAsync();
-
-                return findStudy.Id;
-            }
-
-        }
-
-
-        // 从DICOM文件中获取使用的字符集
-        private string GetEncodingVaulueFromDicomFile(DicomDataset dataset, DicomTag dicomTag)
-        {
-
-            // 获取DICOM文件的特定元素，通常用于指示使用的字符集
-            var charset = dataset.GetSingleValueOrDefault(DicomTag.SpecificCharacterSet, string.Empty);
-
-            var dicomEncoding = DicomEncoding.GetEncoding(charset);
-
-
-            var dicomStringElement = dataset.GetDicomItem<DicomStringElement>(dicomTag);
-
-            var bytes = dicomStringElement.Buffer.Data;
-
-
-            return dicomEncoding.GetString(bytes);
-
-
-            //// 从DICOM文件中获取使用的字符集
-            //string filePath = "C:\\Users\\hang\\Documents\\WeChat Files\\wxid_r2imdzb7j3q922\\FileStorage\\File\\2024-05\\1.2.840.113619.2.80.169103990.5390.1271401378.4.dcm";
-            //DicomFile dicomFile = DicomFile.Open(filePath);
-
-            //// 获取DICOM文件的特定元素，通常用于指示使用的字符集
-            //var charset = dicomFile.Dataset.GetSingleValueOrDefault(DicomTag.SpecificCharacterSet, string.Empty);
-
-            //var dicomEncoding = DicomEncoding.GetEncoding(charset);
-
-            //var value = dicomFile.Dataset.GetSingleValueOrDefault(DicomTag.PatientName, string.Empty);
-
-            //var dicomStringElement = dicomFile.Dataset.GetDicomItem<DicomStringElement>(DicomTag.PatientName);
-
-            //var bytes = dicomStringElement.Buffer.Data;
-
-            //var aa= dicomEncoding.GetString(bytes);
-
-
-        }
-    }
-}

IRC.Core.Dicom/Service/Interface/IDicomArchiveService.cs

@@ -1,11 +0,0 @@
-using FellowOakDicom;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
-
-namespace IRaCIS.Core.SCP.Service
-{
-    public interface IDicomArchiveService
-    {
-        Task<Guid> ArchiveDicomFileAsync(DicomDataset dicomDataset,Guid trialId,Guid trialSiteId, string fileRelativePath,string callingAE,string calledAE,long fileSize);
-
-    }
-}

IRC.Core.Dicom/Service/OSSService.cs

@@ -1,770 +0,0 @@
-using AlibabaCloud.SDK.Sts20150401;
-using Aliyun.OSS;
-using Amazon;
-using Amazon.Runtime;
-using Amazon.S3;
-using Amazon.S3.Model;
-using Amazon.SecurityToken;
-using Amazon.SecurityToken.Model;
-using IRaCIS.Core.Infrastructure;
-using IRaCIS.Core.Infrastructure.NewtonsoftJson;
-using MassTransit;
-using Microsoft.Extensions.Options;
-using Minio;
-using Minio.DataModel.Args;
-using System.Reactive.Linq;
-using System.Runtime.InteropServices;
-
-namespace IRaCIS.Core.SCP;
-
-#region 绑定和返回模型
-
-[LowerCamelCaseJson]
-public class MinIOOptions : AWSOptions
-{
-    public int Port { get; set; }
-
-}
-
-
-public class AWSOptions
-{
-    public string EndPoint { get; set; }
-    public bool UseSSL { get; set; }
-    public string AccessKeyId { get; set; }
-    public string RoleArn { get; set; }
-    public string SecretAccessKey { get; set; }
-    public string BucketName { get; set; }
-    public string ViewEndpoint { get; set; }
-    public int DurationSeconds { get; set; }
-    public string Region { get; set; }
-}
-
-public class AliyunOSSOptions
-{
-    public string RegionId { get; set; }
-    public string AccessKeyId { get; set; }
-    public string AccessKeySecret { get; set; }
-
-    public string InternalEndpoint { get; set; }
-
-    public string EndPoint { get; set; }
-    public string BucketName { get; set; }
-
-    public string RoleArn { get; set; }
-
-    public string Region { get; set; }
-
-    public string ViewEndpoint { get; set; }
-
-    public int DurationSeconds { get; set; }
-
-
-
-}
-
-public class ObjectStoreServiceOptions
-{
-    public string ObjectStoreUse { get; set; }
-
-    public AliyunOSSOptions AliyunOSS { get; set; }
-
-
-    public MinIOOptions MinIO { get; set; }
-
-    public AWSOptions AWS { get; set; }
-
-}
-
-public class ObjectStoreDTO
-{
-    public string ObjectStoreUse { get; set; }
-
-
-    public AliyunOSSTempToken AliyunOSS { get; set; }
-
-    public MinIOOptions MinIO { get; set; }
-
-    public AWSTempToken AWS { get; set; }
-
-}
-
-[LowerCamelCaseJson]
-public class AliyunOSSTempToken
-{
-    public string AccessKeyId { get; set; }
-    public string AccessKeySecret { get; set; }
-
-    public string EndPoint { get; set; }
-    public string BucketName { get; set; }
-
-    public string Region { get; set; }
-
-    public string ViewEndpoint { get; set; }
-
-    public string SecurityToken { get; set; }
-    public DateTime Expiration { get; set; }
-
-
-}
-
-[LowerCamelCaseJson]
-public class AWSTempToken
-{
-    public string Region { get; set; }
-    public string SessionToken { get; set; }
-    public string EndPoint { get; set; }
-    public string AccessKeyId { get; set; }
-    public string SecretAccessKey { get; set; }
-    public string BucketName { get; set; }
-    public string ViewEndpoint { get; set; }
-    public DateTime Expiration { get; set; }
-}
-
-public enum ObjectStoreUse
-{
-    AliyunOSS = 0,
-    MinIO = 1,
-    AWS = 2,
-}
-
-#endregion
-
-// aws 参考链接 https://github.com/awsdocs/aws-doc-sdk-examples/tree/main/dotnetv3/S3/S3_Basics
-
-public interface IOSSService
-{
-    public Task<string> UploadToOSSAsync(Stream fileStream, string oosFolderPath, string fileRealName, bool isFileNameAddGuid = true);
-    public Task<string> UploadToOSSAsync(string localFilePath, string oosFolderPath, bool isFileNameAddGuid = true);
-
-    public Task DownLoadFromOSSAsync(string ossRelativePath, string localFilePath);
-
-    public ObjectStoreServiceOptions ObjectStoreServiceOptions { get; set; }
-
-    public Task<string> GetSignedUrl(string ossRelativePath);
-
-    public Task DeleteFromPrefix(string prefix);
-
-    public ObjectStoreDTO GetObjectStoreTempToken();
-}
-
-
-public class OSSService : IOSSService
-{
-    public ObjectStoreServiceOptions ObjectStoreServiceOptions { get; set; }
-
-    private AliyunOSSTempToken AliyunOSSTempToken { get; set; }
-
-    private AWSTempToken AWSTempToken { get; set; }
-
-
-    public OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options)
-    {
-        ObjectStoreServiceOptions = options.CurrentValue;
-
-    }
-
-
-
-    /// <summary>
-    ///  oosFolderPath  不要 "/ "开头   应该： TempFolder/ChildFolder
-    /// </summary>
-    /// <param name="fileStream"></param>
-    /// <param name="oosFolderPath"></param>
-    /// <param name="fileRealName"></param>
-    /// <param name="isFileNameAddGuid"></param>
-    /// <returns></returns>
-    public async Task<string> UploadToOSSAsync(Stream fileStream, string oosFolderPath, string fileRealName, bool isFileNameAddGuid = true)
-    {
-        GetObjectStoreTempToken();
-
-        var ossRelativePath = isFileNameAddGuid ? $"{oosFolderPath}/{Guid.NewGuid()}_{fileRealName}" : $"{oosFolderPath}/{fileRealName}";
-
-        try
-        {
-            using (var memoryStream = new MemoryStream())
-            {
-                fileStream.Seek(0, SeekOrigin.Begin);
-
-                fileStream.CopyTo(memoryStream);
-
-                memoryStream.Seek(0, SeekOrigin.Begin);
-
-
-                if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
-                {
-                    var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
-
-                    var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.EndPoint : aliConfig.InternalEndpoint, AliyunOSSTempToken.AccessKeyId, AliyunOSSTempToken.AccessKeySecret, AliyunOSSTempToken.SecurityToken);
-
-
-
-                    // 上传文件
-                    var result = _ossClient.PutObject(aliConfig.BucketName, ossRelativePath, memoryStream);
-
-                }
-                else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
-                {
-                    var minIOConfig = ObjectStoreServiceOptions.MinIO;
-
-
-                    var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.EndPoint}:{minIOConfig.Port}")
-                        .WithCredentials(minIOConfig.AccessKeyId, minIOConfig.SecretAccessKey).WithSSL(minIOConfig.UseSSL)
-                        .Build();
-
-                    var putObjectArgs = new PutObjectArgs()
-                           .WithBucket(minIOConfig.BucketName)
-                           .WithObject(ossRelativePath)
-                           .WithStreamData(memoryStream)
-                           .WithObjectSize(memoryStream.Length);
-
-                    await minioClient.PutObjectAsync(putObjectArgs);
-                }
-                else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
-                {
-                    var awsConfig = ObjectStoreServiceOptions.AWS;
-
-                    var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken);
-
-
-
-                    //提供awsEndPoint（域名）进行访问配置
-                    var clientConfig = new AmazonS3Config
-                    {
-                        RegionEndpoint = RegionEndpoint.USEast1,
-                        UseHttp = true,
-                    };
-
-                    var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
-
-                    var putObjectRequest = new Amazon.S3.Model.PutObjectRequest()
-                    {
-                        BucketName = awsConfig.BucketName,
-                        InputStream = memoryStream,
-                        Key = ossRelativePath,
-                    };
-
-                    await amazonS3Client.PutObjectAsync(putObjectRequest);
-                }
-                else
-                {
-                    throw new BusinessValidationFailedException("未定义的存储介质类型");
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-
-            throw new BusinessValidationFailedException($"上传发生异常：{ex.Message}");
-        }
-
-
-
-
-        return "/" + ossRelativePath;
-
-    }
-
-
-
-    /// <summary>
-    /// oosFolderPath  不要 "/ "开头   应该： TempFolder/ChildFolder
-    /// </summary>
-    /// <param name="localFilePath"></param>
-    /// <param name="oosFolderPath"></param>
-    /// <param name="isFileNameAddGuid"></param>
-    /// <returns></returns>
-    /// <exception cref="BusinessValidationFailedException"></exception>
-    public async Task<string> UploadToOSSAsync(string localFilePath, string oosFolderPath, bool isFileNameAddGuid = true)
-    {
-        GetObjectStoreTempToken();
-
-        var localFileName = Path.GetFileName(localFilePath);
-
-        var ossRelativePath = isFileNameAddGuid ? $"{oosFolderPath}/{Guid.NewGuid()}_{localFileName}" : $"{oosFolderPath}/{localFileName}";
-
-
-        if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
-        {
-            var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
-
-            var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.EndPoint : aliConfig.InternalEndpoint, AliyunOSSTempToken.AccessKeyId, AliyunOSSTempToken.AccessKeySecret, AliyunOSSTempToken.SecurityToken);
-
-            // 上传文件
-            var result = _ossClient.PutObject(aliConfig.BucketName, ossRelativePath, localFilePath);
-
-        }
-        else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
-        {
-            var minIOConfig = ObjectStoreServiceOptions.MinIO;
-
-
-            var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.EndPoint}:{minIOConfig.Port}")
-                .WithCredentials(minIOConfig.AccessKeyId, minIOConfig.SecretAccessKey).WithSSL(minIOConfig.UseSSL)
-                .Build();
-
-            var putObjectArgs = new PutObjectArgs()
-                   .WithBucket(minIOConfig.BucketName)
-                   .WithObject(ossRelativePath)
-                   .WithFileName(localFilePath);
-
-            await minioClient.PutObjectAsync(putObjectArgs);
-        }
-        else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
-        {
-            var awsConfig = ObjectStoreServiceOptions.AWS;
-
-            // 提供awsAccessKeyId和awsSecretAccessKey构造凭证
-            var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken);
-
-            //提供awsEndPoint（域名）进行访问配置
-            var clientConfig = new AmazonS3Config
-            {
-                RegionEndpoint = RegionEndpoint.USEast1,
-                UseHttp = true,
-            };
-
-            var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
-
-            var putObjectRequest = new Amazon.S3.Model.PutObjectRequest()
-            {
-                BucketName = awsConfig.BucketName,
-                FilePath = localFilePath,
-                Key = ossRelativePath,
-            };
-
-            await amazonS3Client.PutObjectAsync(putObjectRequest);
-
-        }
-        else
-        {
-            throw new BusinessValidationFailedException("未定义的存储介质类型");
-        }
-        return "/" + ossRelativePath;
-
-    }
-
-
-    public async Task DownLoadFromOSSAsync(string ossRelativePath, string localFilePath)
-    {
-        GetObjectStoreTempToken();
-
-        ossRelativePath = ossRelativePath.TrimStart('/');
-        try
-        {
-
-
-            if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
-            {
-                var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
-
-                var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.EndPoint : aliConfig.InternalEndpoint, AliyunOSSTempToken.AccessKeyId, AliyunOSSTempToken.AccessKeySecret, AliyunOSSTempToken.SecurityToken);
-
-                // 上传文件
-                var result = _ossClient.GetObject(aliConfig.BucketName, ossRelativePath);
-
-                // 将下载的文件流保存到本地文件
-                using (var fs = File.OpenWrite(localFilePath))
-                {
-                    result.Content.CopyTo(fs);
-                    fs.Close();
-                }
-
-            }
-            else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
-            {
-                var minIOConfig = ObjectStoreServiceOptions.MinIO;
-
-                var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.EndPoint}:{minIOConfig.Port}")
-                    .WithCredentials(minIOConfig.AccessKeyId, minIOConfig.SecretAccessKey).WithSSL(minIOConfig.UseSSL)
-                    .Build();
-
-                var getObjectArgs = new GetObjectArgs()
-                .WithBucket(minIOConfig.BucketName)
-                .WithObject(ossRelativePath)
-                .WithFile(localFilePath);
-
-                await minioClient.GetObjectAsync(getObjectArgs);
-
-            }
-            else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
-            {
-                var awsConfig = ObjectStoreServiceOptions.AWS;
-
-                // 提供awsAccessKeyId和awsSecretAccessKey构造凭证
-                var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken);
-
-                //提供awsEndPoint（域名）进行访问配置
-                var clientConfig = new AmazonS3Config
-                {
-                    RegionEndpoint = RegionEndpoint.USEast1,
-                    UseHttp = true,
-                };
-
-                var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
-
-                var getObjectArgs = new Amazon.S3.Model.GetObjectRequest()
-                {
-                    BucketName = awsConfig.BucketName,
-                    Key = ossRelativePath,
-                };
-
-
-                await (await amazonS3Client.GetObjectAsync(getObjectArgs)).WriteResponseStreamToFileAsync(localFilePath, true, CancellationToken.None);
-
-
-            }
-            else
-            {
-                throw new BusinessValidationFailedException("未定义的存储介质类型");
-            }
-        }
-        catch (Exception ex)
-        {
-
-            throw new BusinessValidationFailedException("oss下载失败!" + ex.Message);
-        }
-
-
-
-
-
-    }
-
-    public async Task<string> GetSignedUrl(string ossRelativePath)
-    {
-        GetObjectStoreTempToken();
-
-        ossRelativePath = ossRelativePath.TrimStart('/');
-        try
-        {
-
-
-            if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
-            {
-                var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
-
-                var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.EndPoint : aliConfig.InternalEndpoint, AliyunOSSTempToken.AccessKeyId, AliyunOSSTempToken.AccessKeySecret, AliyunOSSTempToken.SecurityToken);
-
-                // 生成签名URL。
-                var req = new GeneratePresignedUriRequest(aliConfig.BucketName, ossRelativePath, SignHttpMethod.Get)
-                {
-                    // 设置签名URL过期时间，默认值为3600秒。
-                    Expiration = DateTime.Now.AddHours(1),
-                };
-                var uri = _ossClient.GeneratePresignedUri(req);
-
-                return uri.PathAndQuery;
-
-            }
-            else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
-            {
-                var minIOConfig = ObjectStoreServiceOptions.MinIO;
-
-                var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.EndPoint}:{minIOConfig.Port}")
-                    .WithCredentials(minIOConfig.AccessKeyId, minIOConfig.SecretAccessKey).WithSSL(minIOConfig.UseSSL)
-                    .Build();
-
-
-                var args = new PresignedGetObjectArgs()
-                    .WithBucket(minIOConfig.BucketName)
-                    .WithObject(ossRelativePath)
-                    .WithExpiry(3600)
-                    /*.WithHeaders(reqParams)*/;
-
-                var presignedUrl = await minioClient.PresignedGetObjectAsync(args);
-
-                Uri uri = new Uri(presignedUrl);
-
-                string relativePath = uri.PathAndQuery;
-
-
-                return relativePath;
-
-            }
-            else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
-            {
-                var awsConfig = ObjectStoreServiceOptions.AWS;
-
-
-                // 提供awsAccessKeyId和awsSecretAccessKey构造凭证
-                var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken);
-
-                //提供awsEndPoint（域名）进行访问配置
-                var clientConfig = new AmazonS3Config
-                {
-                    RegionEndpoint = RegionEndpoint.USEast1,
-                    UseHttp = true,
-                };
-
-                var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
-
-                var presignedUrl = await amazonS3Client.GetPreSignedURLAsync(new GetPreSignedUrlRequest()
-                {
-                    BucketName = awsConfig.BucketName,
-                    Key = ossRelativePath,
-                    Expires = DateTime.UtcNow.AddMinutes(120)
-                });
-
-                Uri uri = new Uri(presignedUrl);
-
-                string relativePath = uri.PathAndQuery;
-
-
-                return relativePath;
-            }
-            else
-            {
-                throw new BusinessValidationFailedException("未定义的存储介质类型");
-            }
-        }
-        catch (Exception ex)
-        {
-
-            throw new BusinessValidationFailedException("oss授权url失败!" + ex.Message);
-        }
-
-    }
-
-    /// <summary>
-    /// 删除某个目录的文件
-    /// </summary>
-    /// <param name="prefix"></param>
-    /// <returns></returns>
-    public async Task DeleteFromPrefix(string prefix)
-    {
-        GetObjectStoreTempToken();
-
-        if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
-        {
-            var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
-
-            var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.EndPoint : aliConfig.InternalEndpoint, AliyunOSSTempToken.AccessKeyId, AliyunOSSTempToken.AccessKeySecret, AliyunOSSTempToken.SecurityToken);
-
-
-            try
-            {
-                ObjectListing objectListing = null;
-                string nextMarker = null;
-                do
-                {
-                    // 使用 prefix 模拟目录结构，设置 MaxKeys 和 NextMarker
-                    objectListing = _ossClient.ListObjects(new Aliyun.OSS.ListObjectsRequest(aliConfig.BucketName)
-                    {
-                        Prefix = prefix,
-                        MaxKeys = 1000,
-                        Marker = nextMarker
-                    });
-
-                    List<string> keys = objectListing.ObjectSummaries.Select(t => t.Key).ToList();
-
-                    // 删除获取到的文件
-                    if (keys.Count > 0)
-                    {
-                        _ossClient.DeleteObjects(new Aliyun.OSS.DeleteObjectsRequest(aliConfig.BucketName, keys, false));
-                    }
-
-                    // 设置 NextMarker 以获取下一页的数据
-                    nextMarker = objectListing.NextMarker;
-
-                } while (objectListing.IsTruncated);
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine($"Error: {ex.Message}");
-            }
-
-
-        }
-        else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
-        {
-            var minIOConfig = ObjectStoreServiceOptions.MinIO;
-
-
-            var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.EndPoint}:{minIOConfig.Port}")
-                .WithCredentials(minIOConfig.AccessKeyId, minIOConfig.SecretAccessKey).WithSSL(minIOConfig.UseSSL)
-                .Build();
-
-
-            var listArgs = new ListObjectsArgs().WithBucket(minIOConfig.BucketName).WithPrefix(prefix).WithRecursive(true);
-
-
-
-            // 创建一个空列表用于存储对象键
-            var objects = new List<string>();
-
-            // 使用 await foreach 来异步迭代对象列表
-            await foreach (var item in minioClient.ListObjectsEnumAsync(listArgs))
-            {
-                objects.Add(item.Key);
-            }
-
-
-            if (objects.Count > 0)
-            {
-                var objArgs = new RemoveObjectsArgs()
-              .WithBucket(minIOConfig.BucketName)
-              .WithObjects(objects);
-
-                // 删除对象
-                await minioClient.RemoveObjectsAsync(objArgs);
-            }
-
-
-
-        }
-        else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
-        {
-
-            var awsConfig = ObjectStoreServiceOptions.AWS;
-
-
-            // 提供awsAccessKeyId和awsSecretAccessKey构造凭证
-            var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken);
-
-            //提供awsEndPoint（域名）进行访问配置
-            var clientConfig = new AmazonS3Config
-            {
-                RegionEndpoint = RegionEndpoint.USEast1,
-                UseHttp = true,
-            };
-
-            var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
-
-            // 列出指定前缀下的所有对象
-            var listObjectsRequest = new ListObjectsV2Request
-            {
-                BucketName = awsConfig.BucketName,
-                Prefix = prefix
-            };
-
-            var listObjectsResponse = await amazonS3Client.ListObjectsV2Async(listObjectsRequest);
-
-            if (listObjectsResponse.S3Objects.Count > 0)
-            {
-                // 准备删除请求
-                var deleteObjectsRequest = new Amazon.S3.Model.DeleteObjectsRequest
-                {
-                    BucketName = awsConfig.BucketName,
-                    Objects = new List<KeyVersion>()
-                };
-
-                foreach (var s3Object in listObjectsResponse.S3Objects)
-                {
-                    deleteObjectsRequest.Objects.Add(new KeyVersion
-                    {
-                        Key = s3Object.Key
-                    });
-                }
-
-                // 批量删除对象
-                var deleteObjectsResponse = await amazonS3Client.DeleteObjectsAsync(deleteObjectsRequest);
-            }
-
-
-
-        }
-        else
-        {
-            throw new BusinessValidationFailedException("未定义的存储介质类型");
-        }
-    }
-
-
-    public ObjectStoreDTO GetObjectStoreTempToken()
-    {
-
-        var ossOptions = ObjectStoreServiceOptions.AliyunOSS;
-
-        if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
-        {
-            var client = new Client(new AlibabaCloud.OpenApiClient.Models.Config()
-            {
-                AccessKeyId = ossOptions.AccessKeyId,
-                AccessKeySecret = ossOptions.AccessKeySecret,
-                //AccessKeyId = "LTAI5tJV76pYX5yPg1N9QVE8",
-                //AccessKeySecret = "roRNLa9YG1of4pYruJGCNKBXEWTAWa",
-
-                Endpoint = "sts.cn-hangzhou.aliyuncs.com"
-            });
-
-            var assumeRoleRequest = new AlibabaCloud.SDK.Sts20150401.Models.AssumeRoleRequest();
-            // 将<YOUR_ROLE_SESSION_NAME>设置为自定义的会话名称，例如oss-role-session。
-            assumeRoleRequest.RoleSessionName = $"session-name-{NewId.NextGuid()}";
-            // 将<YOUR_ROLE_ARN>替换为拥有上传文件到指定OSS Bucket权限的RAM角色的ARN。
-            assumeRoleRequest.RoleArn = ossOptions.RoleArn;
-            //assumeRoleRequest.RoleArn = "acs:ram::1899121822495495:role/webdirect";
-            assumeRoleRequest.DurationSeconds = ossOptions.DurationSeconds;
-            var runtime = new AlibabaCloud.TeaUtil.Models.RuntimeOptions();
-            var response = client.AssumeRoleWithOptions(assumeRoleRequest, runtime);
-            var credentials = response.Body.Credentials;
-
-            var tempToken = new AliyunOSSTempToken()
-            {
-                AccessKeyId = credentials.AccessKeyId,
-                AccessKeySecret = credentials.AccessKeySecret,
-
-                //转为服务器时区，最后统一转为客户端时区
-                Expiration = TimeZoneInfo.ConvertTimeFromUtc(DateTime.Parse(credentials.Expiration), TimeZoneInfo.Local),
-                SecurityToken = credentials.SecurityToken,
-
-
-                Region = ossOptions.Region,
-                BucketName = ossOptions.BucketName,
-                EndPoint = ossOptions.EndPoint,
-                ViewEndpoint = ossOptions.ViewEndpoint,
-
-            };
-
-            AliyunOSSTempToken = tempToken;
-
-            return new ObjectStoreDTO() { ObjectStoreUse = ObjectStoreServiceOptions.ObjectStoreUse, AliyunOSS = tempToken };
-        }
-        else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
-        {
-            return new ObjectStoreDTO() { ObjectStoreUse = ObjectStoreServiceOptions.ObjectStoreUse, MinIO = ObjectStoreServiceOptions.MinIO };
-        }
-        else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
-        {
-            var awsOptions = ObjectStoreServiceOptions.AWS;
-
-            //aws 临时凭证
-            // 创建 STS 客户端
-            var stsClient = new AmazonSecurityTokenServiceClient(awsOptions.AccessKeyId, awsOptions.SecretAccessKey);
-
-            // 使用 AssumeRole 请求临时凭证
-            var assumeRoleRequest = new AssumeRoleRequest
-            {
-
-                RoleArn = awsOptions.RoleArn, // 角色 ARN
-                RoleSessionName = $"session-name-{NewId.NextGuid()}",
-                DurationSeconds = awsOptions.DurationSeconds          // 临时凭证有效期
-            };
-
-            var assumeRoleResponse = stsClient.AssumeRoleAsync(assumeRoleRequest).Result;
-
-            var credentials = assumeRoleResponse.Credentials;
-
-            var tempToken = new AWSTempToken()
-            {
-                AccessKeyId = credentials.AccessKeyId,
-                SecretAccessKey = credentials.SecretAccessKey,
-                SessionToken = credentials.SessionToken,
-                Expiration = credentials.Expiration,
-                Region = awsOptions.Region,
-                BucketName = awsOptions.BucketName,
-                EndPoint = awsOptions.EndPoint,
-                ViewEndpoint = awsOptions.ViewEndpoint,
-
-            };
-
-            AWSTempToken = tempToken;
-            return new ObjectStoreDTO() { ObjectStoreUse = ObjectStoreServiceOptions.ObjectStoreUse, AWS = tempToken };
-        }
-        else
-        {
-            throw new BusinessValidationFailedException("未定义的存储介质类型");
-        }
-    }
-
-}

IRC.Core.Dicom/appsettings.Development.json

@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}

IRC.Core.Dicom/appsettings.json

@@ -1,9 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*"
-}

IRC.Core.SCP/Helper/SafeBussinessHelper.cs

@@ -0,0 +1,42 @@
+using Serilog;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Application.Helper
+{
+    public static class SafeBussinessHelper
+    {
+        public static async Task<bool> RunAsync(Func<Task> func, [CallerMemberName] string caller = "", string errorMsgTitle = "")
+        {
+            try
+            {
+                await func();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                Log.Logger.Error($"【{errorMsgTitle}失败 - {caller}】: {ex.Message}");
+                return false;
+            }
+        }
+
+        public static async Task<(bool Success, T? Result)> RunAsync<T>(Func<Task<T>> func, [CallerMemberName] string caller = "", string errorMsgTitle = "")
+        {
+            try
+            {
+                var result = await func();
+                return (true, result);
+            }
+            catch (Exception ex)
+            {
+                Log.Logger.Error($"【{errorMsgTitle}失败 - {caller}】: {ex.Message}");
+                return (false, default);
+            }
+        }
+    }
+
+}

IRC.Core.SCP/HostConfig/EFSetup.cs

@@ -27,8 +27,7 @@ namespace IRaCIS.Core.SCP
                 //public static readonly ILoggerFactory MyLoggerFactory    = LoggerFactory.Create(builder => { builder.AddConsole(); });
                 var logFactory = LoggerFactory.Create(builder => { builder.AddDebug(); });
 
-                options.UseSqlServer(configuration.GetSection("ConnectionStrings:RemoteNew").Value,
-                    contextOptionsBuilder => contextOptionsBuilder.EnableRetryOnFailure());
+                options.UseSqlServer(configuration.GetSection("ConnectionStrings:RemoteNew").Value);
 
                 options.UseLoggerFactory(logFactory);
 

IRC.Core.SCP/HostConfig/SwaggerSetup.cs

@@ -0,0 +1,134 @@
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.OpenApi.Models;
+using Swashbuckle.AspNetCore.Filters;
+using Swashbuckle.AspNetCore.SwaggerGen;
+using Swashbuckle.AspNetCore.SwaggerUI;
+using System;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+
+namespace IRaCIS.Core.API;
+
+public enum SwaggerVersion
+{
+    //[Description("HIR修改")]
+    //HIR = -1,
+
+    //[Description("医生模块")]
+    //Reviewer = 1,
+
+    [Description("项目模块")]
+    Trial = 2,
+    //[Description("入组模块")]
+    //Enroll = 3,
+    //[Description("工作量模块")]
+    //Workload = 4,
+    //[Description("通用信息获取")]
+    //Common = 5,
+    //[Description("机构信息模块")]
+    //Institution = 6,
+    //[Description("统计模块")]
+    //DashboardStatistics = 7,
+    //[Description("财务模块")]
+    //Financial = 8,
+    //[Description("管理模块")]
+    //Management = 9,
+    //[Description("影像模块")]
+    //Image = 10,
+    //[Description("读片模块")]
+    //Reading = 11
+};
+
+
+public static class SwaggerSetup
+{
+    public static void AddSwaggerSetup(this IServiceCollection services)
+    {
+        services.AddEndpointsApiExplorer();
+        services.AddSwaggerGen(options =>
+        {
+
+            typeof(SwaggerVersion).GetFields(BindingFlags.Public | BindingFlags.Static).ToList()
+             .ForEach(field =>
+             {
+                 var description = field.GetCustomAttribute<DescriptionAttribute>()?.Description ?? field.Name;
+                 options.SwaggerDoc(field.Name, new Microsoft.OpenApi.Models.OpenApiInfo
+                 {
+                     Version = field.Name,
+                     Description = $"{field.Name} API",
+                     Title = description // 使用Description作为Title
+                 });
+             });
+
+            // 接口排序
+            options.OrderActionsBy(o => o.GroupName);
+
+            //添加注释
+            var basePath = AppContext.BaseDirectory;
+            //var xmlPath1 = Path.Combine(basePath, "IRaCIS.Core.Application.xml");
+            var xmlPath2 = Path.Combine(basePath, "IRC.Core.SCP.xml");
+            //options.IncludeXmlComments(xmlPath1, true);
+            options.IncludeXmlComments(xmlPath2, true);
+
+            // 在header中添加token，传递到后台
+            options.OperationFilter<SecurityRequirementsOperationFilter>();
+
+
+            // 添加登录按钮
+            options.AddSecurityDefinition("bearerAuth", new OpenApiSecurityScheme()
+            {
+                Description = "JWT Authorization header using the Bearer scheme. Example: \"Authorization: Bearer {token}\"",
+                Name = "Authorization",
+                //In = "header",
+                //Type = "apiKey"
+            });
+
+        });
+    }
+
+
+
+    public static void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+    {
+        app.UseSwagger();
+        app.UseSwaggerUI(options =>
+        {
+            typeof(SwaggerVersion).GetFields(BindingFlags.Public | BindingFlags.Static).ToList()
+            .ForEach(field =>
+            {
+                var description = field.GetCustomAttribute<DescriptionAttribute>()?.Description ?? field.Name;
+                options.SwaggerEndpoint($"swagger/{field.Name}/swagger.json", $"{description}");
+            });
+
+
+            var data = Assembly.GetExecutingAssembly().Location;
+            options.IndexStream = () => Assembly.GetExecutingAssembly()
+            .GetManifestResourceStream("IRC.Core.SCP.wwwroot.swagger.ui.Index.html");
+
+            //路径配置，设置为空，表示直接在根域名（localhost:8001）访问该文件,
+            //注意localhost:8001/swagger是访问不到的，去launchSettings.json把launchUrl去掉，如果你想换一个路径，直接写名字即可，比如直接写c.Route = "doc";
+            options.RoutePrefix = string.Empty;
+
+            //DocExpansion设置为none可折叠所有方法
+            options.DocExpansion(DocExpansion.None);
+
+            //DefaultModelsExpandDepth设置为 - 1 可不显示models
+            options.DefaultModelsExpandDepth(-1);
+
+            // 关键一句：关闭外网校验
+            options.ConfigObject.ValidatorUrl = null;
+        });
+    }
+
+
+
+
+
+
+
+}

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

@@ -4,31 +4,51 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <BaseOutputPath></BaseOutputPath>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
+    <DocumentationFile>.\IRC.Core.SCP.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="AlibabaCloud.SDK.Sts20150401" Version="1.1.5" />
+    <Content Remove="wwwroot\swagger\ui\abp.js" />
+    <Content Remove="wwwroot\swagger\ui\Index.html" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="wwwroot\swagger\ui\abp.js">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="wwwroot\swagger\ui\Index.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <ItemGroup>
+	  <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.416.8" />
-	  <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.401.81" />
+	  <PackageReference Include="AWSSDK.S3" Version="4.0.6.9" />
+	  <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.2" />
 	  <PackageReference Include="DistributedLock.Core" Version="1.0.8" />
 	  <PackageReference Include="DistributedLock.SqlServer" Version="1.0.6" />
-	  <PackageReference Include="fo-dicom" Version="5.2.1" />
-	  <PackageReference Include="fo-dicom.Codecs" Version="5.16.1" />
-	  <PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.2.1" />
+	  <PackageReference Include="fo-dicom" Version="5.2.2" />
+	  <PackageReference Include="fo-dicom.Codecs" Version="5.16.4" />
+	  <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="7.0.0" />
 	  <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="9.0.0" />
 	  <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
-	  <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
-	  <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1" />
+	  <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" />
+	  <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="9.0.0" />
+	  <PackageReference Include="ZiggyCreatures.FusionCache" Version="2.4.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -36,4 +56,12 @@
     <ProjectReference Include="..\IRaCIS.Core.Infra.EFCore\IRaCIS.Core.Infra.EFCore.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Update="appsettings.Prod_HIR_SCP.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+  </ItemGroup>
+
 </Project>

IRC.Core.SCP/IRC.Core.SCP.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>IRC.Core.SCP</name>
+    </assembly>
+    <members>
+        <member name="M:IRaCIS.Core.SCP.Service.CacheKeys.UserLoginError(System.String)">
+            <summary>
+            用户登录错误 限制登录
+            </summary>
+            <param name="userName"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.SCP.Service.CacheKeys.SkipReadingCacheKey(System.Guid)">
+            <summary>
+            跳过阅片
+            </summary>
+            <param name="userId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.SCP.Service.CacheKeys.StartReadingTimeKey(System.Guid)">
+            <summary>
+            开始阅片时间
+            </summary>
+            <param name="userId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.SCP.Service.CacheKeys.StartRestTime(System.Guid)">
+            <summary>
+            开始休息时间
+            </summary>
+            <param name="userId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.SCP.Service.DicomArchiveService.ArchiveDicomFileAsync(FellowOakDicom.DicomFile,System.String,System.String,System.String,System.Int64)">
+            <summary>
+            单个文件接收 归档
+            </summary>
+            <param name="dataset"></param>
+            <returns></returns>
+            <exception cref="T:System.NotImplementedException"></exception>
+        </member>
+        <member name="M:IRaCIS.Core.SCP.Service.PatientStudyService.AutoBindingPatientStudyVisitAsync(System.Collections.Generic.List{System.Guid})">
+            <summary>
+            传输完成后，自动给检查绑定访视
+            </summary>
+            <param name="inCommand"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.SCP.OSSService.UploadToOSSAsync(System.IO.Stream,System.String,System.String,System.Boolean)">
+            <summary>
+             oosFolderPath  不要 "/ "开头   应该： TempFolder/ChildFolder
+            </summary>
+            <param name="fileStream"></param>
+            <param name="oosFolderPath"></param>
+            <param name="fileRealName"></param>
+            <param name="isFileNameAddGuid"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.SCP.OSSService.UploadToOSSAsync(System.String,System.String,System.Boolean)">
+            <summary>
+            oosFolderPath  不要 "/ "开头   应该： TempFolder/ChildFolder
+            </summary>
+            <param name="localFilePath"></param>
+            <param name="oosFolderPath"></param>
+            <param name="isFileNameAddGuid"></param>
+            <returns></returns>
+            <exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
+        </member>
+        <member name="M:IRaCIS.Core.SCP.OSSService.DeleteFromPrefix(System.String)">
+            <summary>
+            删除某个目录的文件
+            </summary>
+            <param name="prefix"></param>
+            <returns></returns>
+        </member>
+        <member name="T:IRaCIS.Core.Application.Service.BusinessFilter.UnifiedApiResultFilter">
+            <summary>
+             统一返回前端数据包装，之前在控制器包装，现在修改为动态Api  在ResultFilter这里包装，减少重复冗余代码
+            by zhouhang 2021.09.12 周末
+            </summary>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.BusinessFilter.UnifiedApiResultFilter.OnResultExecutionAsync(Microsoft.AspNetCore.Mvc.Filters.ResultExecutingContext,Microsoft.AspNetCore.Mvc.Filters.ResultExecutionDelegate)">
+            <summary>
+            异步版本
+            </summary>
+            <param name="context"></param>
+            <param name="next"></param>
+            <returns></returns>
+        </member>
+    </members>
+</doc>

IRC.Core.SCP/Program.cs

@@ -6,6 +6,7 @@ using FellowOakDicom;
 using FellowOakDicom.Imaging;
 using FellowOakDicom.Imaging.NativeCodec;
 using FellowOakDicom.Network;
+using IRaCIS.Core.API;
 using IRaCIS.Core.Infra.EFCore;
 using IRaCIS.Core.SCP;
 using IRaCIS.Core.SCP.Filter;
@@ -14,6 +15,7 @@ using MassTransit;
 using MassTransit.NewIdProviders;
 using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Identity.Client;
 using Panda.DynamicWebApi;
 using Serilog;
 using Serilog.Events;
@@ -82,7 +84,6 @@ builder.Services.AddControllers(options =>
     .AddNewtonsoftJsonSetup(builder.Services); // NewtonsoftJson 序列化  处理
 
 
-builder.Services.AddOptions().Configure<AliyunOSSOptions>(_configuration.GetSection("AliyunOSS"));
 builder.Services.AddOptions().Configure<ObjectStoreServiceOptions>(_configuration.GetSection("ObjectStoreService"));
 builder.Services.AddOptions().Configure<DicomSCPServiceOption>(_configuration.GetSection("DicomSCPServiceConfig"));
 
@@ -126,14 +127,14 @@ builder.Services.Configure<ForwardedHeadersOptions>(options =>
         ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
 });
 
-
 builder.Services.AddFellowOakDicom().AddTranscoderManager<NativeTranscoderManager>()
               //.AddTranscoderManager<FellowOakDicom.Imaging.NativeCodec.NativeTranscoderManager>()
               .AddImageManager<ImageSharpImageManager>();
 
 
-//Dicom影像渲染图片  跨平台
-//builder.Services.AddDicomSetup();
+
+////Dicom影像渲染图片  跨平台
+////builder.Services.AddDicomSetup();
 //new DicomSetupBuilder()
 //       .RegisterServices(s =>
 //            s.AddFellowOakDicom()
@@ -141,8 +142,8 @@ builder.Services.AddFellowOakDicom().AddTranscoderManager<NativeTranscoderManage
 //              //.AddTranscoderManager<FellowOakDicom.Imaging.NativeCodec.NativeTranscoderManager>()
 //              .AddImageManager<ImageSharpImageManager>())
 //       .SkipValidation()
-//       .Build();
 
+//       .Build();
 
 
 #endregion
@@ -151,18 +152,29 @@ builder.Services.AddFellowOakDicom().AddTranscoderManager<NativeTranscoderManage
 
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
+//builder.Services.AddEndpointsApiExplorer();
+//builder.Services.AddSwaggerGen();
+
+//Swagger Api 文档
+builder.Services.AddSwaggerSetup();
+
+// FusionCache
+builder.Services.AddFusionCache();
 
 var app = builder.Build();
 
 // Configure the HTTP request pipeline.
 //if (app.Environment.IsDevelopment())
 //{
-app.UseSwagger();
-app.UseSwaggerUI();
+//app.UseSwagger();
+//app.UseSwaggerUI();
 //}
 
+//不需要 token 访问的静态文件  wwwroot css, JavaScript, and images don't require authentication.
+app.UseStaticFiles();
+
+SwaggerSetup.Configure(app, app.Environment);
+
 app.UseAuthorization();
 
 app.MapControllers();
@@ -191,6 +203,7 @@ app.MapControllers();
 Log.Logger = new LoggerConfiguration()
      //.MinimumLevel.Information()
      .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
+     .MinimumLevel.Override("ZiggyCreatures.Caching.Fusion", LogEventLevel.Warning)
     .WriteTo.Console()
     .WriteTo.File($"{AppContext.BaseDirectory}Serilogs/.log", rollingInterval: RollingInterval.Day)
     .CreateLogger();
@@ -219,9 +232,15 @@ else
 
 DicomSetupBuilder.UseServiceProvider(app.Services);
 
+// Program.cs
+IRCAppConfig.Configuration = builder.Configuration;
+
+
 var logger = app.Services.GetService<Microsoft.Extensions.Logging.ILogger<Program>>();
 
 var server = DicomServerFactory.Create<CStoreSCPService>(_configuration.GetSection("DicomSCPServiceConfig").GetValue<int>("ServerPort"), userState: app.Services,logger: logger);
 
 
+
+
 app.Run();

IRC.Core.SCP/Properties/launchSettings.json

@@ -1,34 +1,34 @@
 {
   "$schema": "http://json.schemastore.org/launchsettings.json",
   "profiles": {
-    "Test_IRC_SCP": {
+    "Test_HIR_SCP": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
       "launchUrl": "swagger",
       "applicationUrl": "http://localhost:6200",
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Test_IRC_SCP"
+        "ASPNETCORE_ENVIRONMENT": "Test_HIR_SCP"
       }
     },
-    "Uat_IRC_SCP": {
+    "Uat_HIR_SCP": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
       "launchUrl": "swagger",
       "applicationUrl": "http://localhost:6200",
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Uat_IRC_SCP"
+        "ASPNETCORE_ENVIRONMENT": "Uat_HIR_SCP"
       }
     },
-    "US_Prod_IRC_SCP": {
+    "Prod_HIR_SCP": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
       "launchUrl": "swagger",
       "applicationUrl": "http://localhost:6200",
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "US_Prod_SCP"
+        "ASPNETCORE_ENVIRONMENT": "Prod_HIR_SCP"
       }
     }
   }

IRC.Core.SCP/Service/CacheHelper.cs

@@ -0,0 +1,101 @@
+using IRaCIS.Core.Domain.Models;
+using IRaCIS.Core.Infra.EFCore;
+using Microsoft.EntityFrameworkCore;
+
+namespace IRaCIS.Core.SCP.Service;
+
+
+public static class CacheKeys
+{
+    //项目缓存
+    public static string Trial(string trialIdStr) => $"TrialId:{trialIdStr}";
+
+    //检查编号递增锁
+    public static string TrialStudyMaxCode(Guid trialId) => $"TrialStudyMaxCode:{trialId}";
+
+    public static string TrialStudyUidUploading(Guid trialId, string studyUid) => $"TrialStudyUid:{trialId}_{studyUid}";
+    //CRC上传影像提交锁key
+    public static string TrialStudyUidDBLock(Guid trialId, string studyUid) => $"TrialStudyUidDBLock:{trialId}_{studyUid}";
+
+    public static string TrialTaskStudyUidUploading(Guid trialId, Guid visiTaskId, string studyUid) => $"TrialStudyUid:{trialId}_{visiTaskId}_{studyUid}";
+    //影像后处理上传提交锁key
+    public static string TrialTaskStudyUidDBLock(Guid trialId, Guid visiTaskId, string studyUid) => $"TrialTaskStudyUidDBLock:{trialId}_{visiTaskId}_{studyUid}";
+    //系统匿名化
+    public static string SystemAnonymization => $"SystemAnonymization";
+    //前端国际化
+    public static string FrontInternational => $"FrontInternationalList";
+
+    //登录挤账号
+    public static string UserToken(Guid userId) => $"UserToken:{userId}";
+
+    //超时没请求接口自动退出
+    public static string UserAutoLoginOut(Guid userId) => $"UserAutoLoginOut:{userId}";
+
+
+    public static string UserDisable(Guid userId) => $"UserDisable:{userId}";
+
+    public static string UserRoleDisable(Guid userRoleId) => $"UserRoleDisable:{userRoleId}";
+
+    /// <summary>
+    /// 用户登录错误 限制登录
+    /// </summary>
+    /// <param name="userName"></param>
+    /// <returns></returns>
+    public static string UserLoginError(string userName) => $"login-failures:{userName}";
+
+    /// <summary>
+    /// 跳过阅片
+    /// </summary>
+    /// <param name="userId"></param>
+    /// <returns></returns>
+    public static string SkipReadingCacheKey(Guid userId) => $"{userId}SkipReadingCache";
+
+
+    /// <summary>
+    /// 开始阅片时间
+    /// </summary>
+    /// <param name="userId"></param>
+    /// <returns></returns>
+    public static string StartReadingTimeKey(Guid userId) => $"{userId}StartReadingTime";
+
+    /// <summary>
+    /// 开始休息时间
+    /// </summary>
+    /// <param name="userId"></param>
+    /// <returns></returns>
+    public static string StartRestTime(Guid userId) => $"{userId}StartRestTime";
+
+    //每个用户 每个浏览器独立时间
+    public static string UserMFAVerifyPass(Guid userId, string browserFingerprint) => $"UserMFAVerifyPass:{userId}:{browserFingerprint}";
+
+    public static string TrialSiteInfo(Guid trialSiteId) => $"{trialSiteId}TrialSiteInfo";
+}
+
+public static class CacheHelper
+{
+    public static async Task<string?> GetTrialStatusAsync(Guid trialId, IRepository<Trial> _trialRepository)
+    {
+        var statusStr = await _trialRepository.Where(t => t.Id == trialId, ignoreQueryFilters: true).Select(t => t.TrialStatusStr).FirstOrDefaultAsync();
+
+        return statusStr;
+    }
+
+    public class TrialSiteInfoDTO
+    {
+        public string TrialSiteCode { get; set; }
+        public string TrialCode { get; set; }
+    }
+    public static async Task<TrialSiteInfoDTO> GetTrialSiteInfo(Guid trialSiteId, IRepository<TrialSite> _trialSiteRepository)
+    {
+        var obj = await _trialSiteRepository.Where(t => t.Id == trialSiteId, ignoreQueryFilters: true).Select(t => new TrialSiteInfoDTO { TrialCode= t.Trial.TrialCode, TrialSiteCode= t.TrialSiteCode }).FirstOrDefaultAsync();
+
+        return obj??new TrialSiteInfoDTO();
+    }
+
+    public static async Task<List<SystemAnonymization>> GetSystemAnonymizationListAsync(IRepository<SystemAnonymization> _systemAnonymizationRepository)
+    {
+        var list = await _systemAnonymizationRepository.Where(t => t.IsEnable).ToListAsync();
+
+        return list;
+    }
+}

IRC.Core.SCP/Service/DicomArchiveService.cs

@@ -11,37 +11,19 @@ using FellowOakDicom.Network;
 using IRaCIS.Core.SCP.Service;
 using IRaCIS.Core.Infra.EFCore;
 using MassTransit;
-using System.Runtime.Intrinsics.X86;
 using Serilog.Sinks.File;
+using IRaCIS.Core.Infrastructure.Extention;
+using ZiggyCreatures.Caching.Fusion;
 
 namespace IRaCIS.Core.SCP.Service
 {
-    public class DicomArchiveService : BaseService, IDicomArchiveService
+    public class DicomArchiveService(IRepository<SCPPatient> _patientRepository,
+        IRepository<SCPStudy> _studyRepository,
+        IRepository<SCPSeries> _seriesRepository,
+        IRepository<SCPInstance> _instanceRepository
+        ) : BaseService, IDicomArchiveService
     {
-        private readonly IRepository<SCPPatient> _patientRepository;
-        private readonly IRepository<SCPStudy> _studyRepository;
-        private readonly IRepository<SCPSeries> _seriesRepository;
-        private readonly IRepository<SCPInstance> _instanceRepository;
-        private readonly IRepository<Dictionary> _dictionaryRepository;
-        private readonly IDistributedLockProvider _distributedLockProvider;
-
-
-        private List<Guid> _instanceIdList = new List<Guid>();
-
-        public DicomArchiveService(IRepository<SCPPatient> patientRepository, IRepository<SCPStudy> studyRepository,
-            IRepository<SCPSeries> seriesRepository,
-            IRepository<SCPInstance> instanceRepository,
-            IRepository<Dictionary> dictionaryRepository,
-            IDistributedLockProvider distributedLockProvider)
-        {
-            _distributedLockProvider = distributedLockProvider;
-            _studyRepository = studyRepository;
-            _patientRepository = patientRepository;
-            _seriesRepository = seriesRepository;
-            _instanceRepository = instanceRepository;
-            _dictionaryRepository = dictionaryRepository;
-
-        }
+       
 
 
 
@@ -52,18 +34,20 @@ namespace IRaCIS.Core.SCP.Service
         /// <param name="dataset"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public async Task<Guid> ArchiveDicomFileAsync(DicomDataset dataset, Guid trialId, Guid trialSiteId, string fileRelativePath, string callingAE, string calledAE,long fileSize)
+        public async Task<Guid> ArchiveDicomFileAsync(DicomFile dicomFile, string fileRelativePath, string callingAE, string calledAE, long fileSize)
         {
+            var dataset = dicomFile.Dataset;
+
             string studyInstanceUid = dataset.GetString(DicomTag.StudyInstanceUID);
             string seriesInstanceUid = dataset.GetString(DicomTag.SeriesInstanceUID);
             string sopInstanceUid = dataset.GetString(DicomTag.SOPInstanceUID);
 
-            string patientIdStr = dataset.GetSingleValueOrDefault(DicomTag.PatientID,string.Empty);
+            string patientIdStr = dataset.GetSingleValueOrDefault(DicomTag.PatientID, string.Empty);
 
             //Guid patientId= IdentifierHelper.CreateGuid(patientIdStr);
-            Guid studyId = IdentifierHelper.CreateGuid(studyInstanceUid,trialId.ToString());
-            Guid seriesId = IdentifierHelper.CreateGuid(studyInstanceUid, seriesInstanceUid, trialId.ToString());
-            Guid instanceId = IdentifierHelper.CreateGuid(studyInstanceUid, seriesInstanceUid, sopInstanceUid, trialId.ToString());
+            Guid studyId = IdentifierHelper.CreateGuid(studyInstanceUid);
+            Guid seriesId = IdentifierHelper.CreateGuid(studyInstanceUid, seriesInstanceUid);
+            Guid instanceId = IdentifierHelper.CreateGuid(studyInstanceUid, seriesInstanceUid, sopInstanceUid);
 
             var isStudyNeedAdd = false;
             var isSeriesNeedAdd = false;
@@ -74,15 +58,16 @@ namespace IRaCIS.Core.SCP.Service
 
             //using (@lock.Acquire())
             {
-                var findPatient = await _patientRepository.FirstOrDefaultAsync(t => t.PatientIdStr == patientIdStr && t.TrialSiteId==trialSiteId );
-                var findStudy = await _studyRepository.FirstOrDefaultAsync(t=>t.Id== studyId);
-                var findSerice = await _seriesRepository.FirstOrDefaultAsync(t => t.Id ==   seriesId);
+                var findPatient = await _patientRepository.FirstOrDefaultAsync(t => t.PatientIdStr == patientIdStr);
+                var findStudy = await _studyRepository.FirstOrDefaultAsync(t => t.Id == studyId);
+                var findSerice = await _seriesRepository.FirstOrDefaultAsync(t => t.Id == seriesId);
                 var findInstance = await _instanceRepository.FirstOrDefaultAsync(t => t.Id == instanceId);
 
+
                 DateTime? studyTime = dataset.GetSingleValueOrDefault(DicomTag.StudyDate, string.Empty) == string.Empty ? null : dataset.GetSingleValue<DateTime>(DicomTag.StudyDate).Add(dataset.GetSingleValueOrDefault(DicomTag.StudyTime, string.Empty) == string.Empty ? TimeSpan.Zero : dataset.GetSingleValue<DateTime>(DicomTag.StudyTime).TimeOfDay);
 
-                //先传输了修改了患者编号的，又传输了没有修改患者编号的，导致后传输的没有修改患者编号的下面的检查为0
-                if (findPatient == null && findStudy==null)
+                //先传输了,修改了患者编号的，又传输了没有修改患者编号的，导致后传输的没有修改患者编号的下面的检查为0
+                if (findPatient == null /*&& findStudy == null*/)
                 {
                     isPatientNeedAdd = true;
 
@@ -90,8 +75,6 @@ namespace IRaCIS.Core.SCP.Service
                     findPatient = new SCPPatient()
                     {
                         Id = NewId.NextSequentialGuid(),
-                        TrialId=trialId,
-                        TrialSiteId=trialSiteId,
                         PatientIdStr = dataset.GetSingleValueOrDefault(DicomTag.PatientID, string.Empty),
                         PatientName = dataset.GetSingleValueOrDefault(DicomTag.PatientName, string.Empty),
                         PatientAge = dataset.GetSingleValueOrDefault(DicomTag.PatientAge, string.Empty),
@@ -117,20 +100,6 @@ namespace IRaCIS.Core.SCP.Service
                         {
                             findPatient.PatientBirthDate = birthDateStr;
 
-                            DateTime birthDate;
-
-                            if (findPatient.PatientAge == string.Empty && studyTime.HasValue && DateTime.TryParse(findPatient.PatientBirthDate,out birthDate))
-                            {
-                                var patientAge = studyTime.Value.Year - birthDate.Year;
-                                // 如果生日还未到，年龄减去一岁
-                                if (studyTime.Value < birthDate.AddYears(patientAge))
-                                {
-                                    patientAge--;
-                                }
-
-                                findPatient.PatientAge = patientAge.ToString();
-                            }
-
                         }
                         else
                         {
@@ -151,6 +120,32 @@ namespace IRaCIS.Core.SCP.Service
                     }
 
                     findPatient.LatestPushTime = DateTime.Now;
+                    findPatient.PatientName = dataset.GetSingleValueOrDefault(DicomTag.PatientName, string.Empty);
+                    findPatient.PatientSex = dataset.GetSingleValueOrDefault(DicomTag.PatientSex, string.Empty);
+                    findPatient.PatientAge = dataset.GetSingleValueOrDefault(DicomTag.PatientAge, string.Empty);
+                    findPatient.PatientBirthDate = dataset.GetSingleValueOrDefault(DicomTag.PatientBirthDate, string.Empty);
+
+                    if (findPatient.PatientBirthDate.Length == 8)
+                    {
+                        var birthDateStr = $"{findPatient.PatientBirthDate[0]}{findPatient.PatientBirthDate[1]}{findPatient.PatientBirthDate[2]}{findPatient.PatientBirthDate[3]}-{findPatient.PatientBirthDate[4]}{findPatient.PatientBirthDate[5]}-{findPatient.PatientBirthDate[6]}{findPatient.PatientBirthDate[7]}";
+
+                        var yearStr = $"{findPatient.PatientBirthDate[0]}{findPatient.PatientBirthDate[1]}{findPatient.PatientBirthDate[2]}{findPatient.PatientBirthDate[3]}";
+
+                        int year = 0;
+
+                        var canParse = int.TryParse(yearStr, out year);
+
+                        if (canParse && year > 1900)
+                        {
+                            findPatient.PatientBirthDate = birthDateStr;
+
+                        }
+                        else
+                        {
+                            findPatient.PatientBirthDate = string.Empty;
+                        }
+
+                    }
                 }
 
                 if (findStudy == null)
@@ -163,10 +158,12 @@ namespace IRaCIS.Core.SCP.Service
 
                         PatientId = findPatient.Id,
                         Id = studyId,
-                        TrialId = trialId,
-                        TrialSiteId = trialSiteId,
                         StudyInstanceUid = studyInstanceUid,
                         StudyTime = studyTime,
+                        DicomStudyDate = dataset.GetSingleValueOrDefault(DicomTag.StudyDate, string.Empty),
+                        DicomStudyTime = dataset.GetSingleValueOrDefault(DicomTag.StudyTime, string.Empty),
+
+
                         Modalities = dataset.GetSingleValueOrDefault(DicomTag.Modality, string.Empty),
                         //ModalityForEdit = modalityForEdit,
                         Description = dataset.GetSingleValueOrDefault(DicomTag.StudyDescription, string.Empty),
@@ -201,6 +198,20 @@ namespace IRaCIS.Core.SCP.Service
                         findStudy.PatientBirthDate = $"{findStudy.PatientBirthDate[0]}{findStudy.PatientBirthDate[1]}{findStudy.PatientBirthDate[2]}{findStudy.PatientBirthDate[3]}-{findStudy.PatientBirthDate[4]}{findStudy.PatientBirthDate[5]}-{findStudy.PatientBirthDate[6]}{findStudy.PatientBirthDate[7]}";
                     }
                 }
+                else
+                {
+                    findStudy.DicomStudyDate = dataset.GetSingleValueOrDefault(DicomTag.StudyDate, string.Empty);
+                    findStudy.DicomStudyTime = dataset.GetSingleValueOrDefault(DicomTag.StudyTime, string.Empty);
+                    findStudy.CalledAE = calledAE;
+                    findStudy.CallingAE = callingAE;
+                    findStudy.PatientIdStr = patientIdStr;
+                    findStudy.PatientName = dataset.GetSingleValueOrDefault(DicomTag.PatientName, string.Empty);
+                    findStudy.PatientSex = dataset.GetSingleValueOrDefault(DicomTag.PatientSex, string.Empty);
+                    findStudy.PatientAge = dataset.GetSingleValueOrDefault(DicomTag.PatientAge, string.Empty);
+                    findStudy.UpdateTime = DateTime.Now;
+
+                    await _patientRepository.BatchUpdateNoTrackingAsync(t => t.Id == findStudy.PatientId, u => new SCPPatient() { LatestPushTime = DateTime.Now });
+                }
 
 
                 if (findSerice == null)
@@ -218,6 +229,9 @@ namespace IRaCIS.Core.SCP.Service
                         //SeriesTime = dataset.GetSingleValueOrDefault(DicomTag.SeriesDate, DateTime.Now).Add(dataset.GetSingleValueOrDefault(DicomTag.SeriesTime, DateTime.Now).TimeOfDay),
                         //SeriesTime = DateTime.TryParse(dataset.GetSingleValue<string>(DicomTag.SeriesDate) + dataset.GetSingleValue<string>(DicomTag.SeriesTime), out DateTime dt) ? dt : null,
                         SeriesTime = dataset.GetSingleValueOrDefault(DicomTag.SeriesDate, string.Empty) == string.Empty ? null : dataset.GetSingleValue<DateTime>(DicomTag.SeriesDate).Add(dataset.GetSingleValueOrDefault(DicomTag.SeriesTime, string.Empty) == string.Empty ? TimeSpan.Zero : dataset.GetSingleValue<DateTime>(DicomTag.SeriesTime).TimeOfDay),
+                        DicomSeriesDate = dataset.GetSingleValueOrDefault(DicomTag.SeriesDate, string.Empty),
+                        DicomSeriesTime = dataset.GetSingleValueOrDefault(DicomTag.SeriesTime, string.Empty),
+
                         Modality = dataset.GetSingleValueOrDefault(DicomTag.Modality, string.Empty),
                         Description = dataset.GetSingleValueOrDefault(DicomTag.SeriesDescription, string.Empty),
                         SliceThickness = dataset.GetSingleValueOrDefault(DicomTag.SliceThickness, string.Empty),
@@ -239,7 +253,20 @@ namespace IRaCIS.Core.SCP.Service
 
                     ++findStudy.SeriesCount;
                 }
+                else
+                {
+                    findSerice.DicomSeriesDate = dataset.GetSingleValueOrDefault(DicomTag.SeriesDate, string.Empty);
+                    findSerice.DicomSeriesTime = dataset.GetSingleValueOrDefault(DicomTag.SeriesTime, string.Empty);
+                    findSerice.UpdateTime = DateTime.Now;
+                }
 
+                var transferSyntaxUID = dicomFile.FileMetaInfo.GetSingleValueOrDefault(DicomTag.TransferSyntaxUID, string.Empty);
+
+                var isEncapsulated = false;
+                if (transferSyntaxUID.IsNotNullOrEmpty())
+                {
+                    isEncapsulated = DicomTransferSyntax.Lookup(DicomUID.Parse(transferSyntaxUID)).IsEncapsulated;
+                }
 
                 if (findInstance == null)
                 {
@@ -253,6 +280,12 @@ namespace IRaCIS.Core.SCP.Service
                         SeriesInstanceUid = findSerice.SeriesInstanceUid,
 
                         SopInstanceUid = sopInstanceUid,
+                        SOPClassUID = dataset.GetSingleValueOrDefault(DicomTag.SOPClassUID, string.Empty),
+                        MediaStorageSOPClassUID = dicomFile.FileMetaInfo.GetSingleValueOrDefault(DicomTag.MediaStorageSOPClassUID, string.Empty),
+                        TransferSyntaxUID = transferSyntaxUID,
+                        MediaStorageSOPInstanceUID = dicomFile.FileMetaInfo.GetSingleValueOrDefault(DicomTag.MediaStorageSOPInstanceUID, string.Empty),
+                        IsEncapsulated = isEncapsulated,
+
                         InstanceNumber = dataset.GetSingleValueOrDefault(DicomTag.InstanceNumber, 1),
                         InstanceTime = dataset.GetSingleValueOrDefault(DicomTag.ContentDate, string.Empty) == string.Empty ? null : dataset.GetSingleValue<DateTime>(DicomTag.ContentDate).Add(dataset.GetSingleValueOrDefault(DicomTag.ContentTime, string.Empty) == string.Empty ? TimeSpan.Zero : dataset.GetSingleValue<DateTime>(DicomTag.ContentTime).TimeOfDay),
                         //InstanceTime = DateTime.TryParse(dataset.GetSingleValue<string>(DicomTag.ContentDate) + dataset.GetSingleValue<string>(DicomTag.ContentTime), out DateTime dt) ? dt : null,
@@ -264,7 +297,7 @@ namespace IRaCIS.Core.SCP.Service
                         SliceLocation = dataset.GetSingleValueOrDefault(DicomTag.SliceLocation, 0),
 
                         SliceThickness = dataset.GetSingleValueOrDefault(DicomTag.SliceThickness, string.Empty),
-                        NumberOfFrames = dataset.GetSingleValueOrDefault(DicomTag.NumberOfFrames, 0),
+                        NumberOfFrames = dataset.GetSingleValueOrDefault(DicomTag.NumberOfFrames, 1),
                         PixelSpacing = dataset.GetSingleValueOrDefault(DicomTag.PixelSpacing, string.Empty),
                         ImagerPixelSpacing = dataset.GetSingleValueOrDefault(DicomTag.ImagerPixelSpacing, string.Empty),
                         FrameOfReferenceUID = dataset.GetSingleValueOrDefault(DicomTag.FrameOfReferenceUID, string.Empty),
@@ -273,13 +306,21 @@ namespace IRaCIS.Core.SCP.Service
 
                         Path = fileRelativePath,
 
-                        FileSize= fileSize,
-
+                        FileSize = fileSize,
                     };
 
                     ++findStudy.InstanceCount;
                     ++findSerice.InstanceCount;
                 }
+                else
+                {
+                    findInstance.SOPClassUID = dataset.GetSingleValueOrDefault(DicomTag.SOPClassUID, string.Empty);
+                    findInstance.MediaStorageSOPClassUID = dicomFile.FileMetaInfo.GetSingleValueOrDefault(DicomTag.MediaStorageSOPClassUID, string.Empty);
+                    findInstance.TransferSyntaxUID = transferSyntaxUID;
+                    findInstance.MediaStorageSOPInstanceUID = dicomFile.FileMetaInfo.GetSingleValueOrDefault(DicomTag.MediaStorageSOPInstanceUID, string.Empty);
+                    findInstance.IsEncapsulated = isEncapsulated;
+                    findInstance.UpdateTime = DateTime.Now;
+                }
 
                 if (isPatientNeedAdd)
                 {
@@ -298,13 +339,14 @@ namespace IRaCIS.Core.SCP.Service
                 {
                     await _seriesRepository.AddAsync(findSerice);
                 }
+
                 if (isInstanceNeedAdd)
                 {
                     await _instanceRepository.AddAsync(findInstance);
                 }
                 else
                 {
-                    await _instanceRepository.BatchUpdateNoTrackingAsync(t => t.Id == instanceId, u => new SCPInstance() { Path = fileRelativePath,FileSize=fileSize });
+                    await _instanceRepository.BatchUpdateNoTrackingAsync(t => t.Id == instanceId, u => new SCPInstance() { Path = fileRelativePath, FileSize = fileSize });
                 }
 
                 await _studyRepository.SaveChangesAsync();

IRC.Core.SCP/Service/Interface/IDicomArchiveService.cs

@@ -5,7 +5,7 @@ namespace IRaCIS.Core.SCP.Service
 {
     public interface IDicomArchiveService
     {
-        Task<Guid> ArchiveDicomFileAsync(DicomDataset dicomDataset,Guid trialId,Guid trialSiteId, string fileRelativePath,string callingAE,string calledAE,long fileSize);
+        Task<Guid> ArchiveDicomFileAsync(DicomFile dicomFile,string fileRelativePath,string callingAE,string calledAE,long fileSize);
 
     }
 }

IRC.Core.SCP/Service/OSSService.cs

@@ -12,6 +12,7 @@ using MassTransit;
 using Microsoft.Extensions.Options;
 using Minio;
 using Minio.DataModel.Args;
+using System.Net;
 using System.Reactive.Linq;
 using System.Runtime.InteropServices;
 
@@ -118,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
@@ -216,9 +217,19 @@ public class OSSService : IOSSService
                            .WithBucket(minIOConfig.BucketName)
                            .WithObject(ossRelativePath)
                            .WithStreamData(memoryStream)
+                           
                            .WithObjectSize(memoryStream.Length);
 
-                    await minioClient.PutObjectAsync(putObjectArgs);
+                  var putResponse =  await minioClient.PutObjectAsync(putObjectArgs);
+
+                    if (putResponse.ResponseStatusCode == HttpStatusCode.OK)
+                    {
+
+                    }
+                    else
+                    {
+                        throw new BusinessValidationFailedException($"上传失败ResponseStatusCode：{putResponse.ResponseStatusCode}{putResponse.ResponseContent}");
+                    }
                 }
                 else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
                 {

IRC.Core.SCP/Service/PatientStudyService.cs

@@ -0,0 +1,317 @@
+using FellowOakDicom;
+using FellowOakDicom.Imaging;
+using FellowOakDicom.Imaging.Codec;
+using FellowOakDicom.Network;
+using IRaCIS.Core.Domain.Models;
+using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infra.EFCore;
+using IRaCIS.Core.Infrastructure;
+using IRaCIS.Core.Infrastructure.Extention;
+using IRaCIS.Core.SCP.Service;
+using MassTransit;
+using Medallion.Threading;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using SixLabors.ImageSharp.Formats.Jpeg;
+using System.Data;
+using System.Text;
+
+namespace IRaCIS.Core.SCP.Service
+{
+    public interface IPatientStudyService
+    {
+        Task<IResponseOutput> AutoBindingPatientStudyVisitAsync(List<Guid> scpStudyIdList);
+    }
+
+    [ApiExplorerSettings(GroupName = "Trial")]
+    public class PatientStudyService : BaseService, IPatientStudyService
+    {
+        private readonly IRepository<SCPStudySubjectVisit> _studySubjectVisitRepository;
+        private readonly IRepository<SubjectPatient> _subjectPatientRepository;
+        private readonly IRepository<Trial> _trialRepository;
+        private readonly IRepository<SCPPatient> _patientRepository;
+        private readonly IRepository<SCPStudy> _studyRepository;
+        private readonly IRepository<Subject> _subjectRepository;
+        private readonly IRepository<SubjectVisit> _subjectVisitRepository;
+        private readonly IDistributedLockProvider _distributedLockProvider;
+
+        public PatientStudyService(IRepository<SCPStudySubjectVisit> studySubjectVisitRepository, IRepository<SCPStudy> studyRepository, IRepository<SubjectPatient> subjectPatientRepository, IRepository<Trial> trialRepository, IRepository<SCPPatient> patientRepository, IRepository<Subject> subjectRepository, IRepository<SubjectVisit> subjectVisitRepository, IDistributedLockProvider distributedLockProvider)
+        {
+            _studySubjectVisitRepository = studySubjectVisitRepository;
+            _studyRepository = studyRepository;
+            _subjectPatientRepository = subjectPatientRepository;
+            _trialRepository = trialRepository;
+            _patientRepository = patientRepository;
+            _subjectRepository = subjectRepository;
+            _subjectVisitRepository = subjectVisitRepository;
+            _distributedLockProvider = distributedLockProvider;
+        }
+
+        [AllowAnonymous]
+        public async Task<IResponseOutput> TestImage(string folderPath)
+        {
+
+            if (!Directory.Exists(folderPath))
+                return ResponseOutput.Ok("目录不存在");
+
+            // 获取所有 .dcm 文件
+            var dicomFiles = Directory.GetFiles(folderPath);
+
+            foreach (var fileFullPath in dicomFiles)
+            {
+                try
+                {
+                    var file = await DicomFile.OpenAsync(fileFullPath);
+
+
+                    // 生成缩略图
+                    using (var memoryStream = new MemoryStream())
+                    {
+                        DicomImage image = new DicomImage(file.Dataset);
+
+                        var sharpimage = image.RenderImage().AsSharpImage();
+                        sharpimage.Save(memoryStream, new JpegEncoder());
+
+
+                        // 关键点：一定要回到开头
+                        memoryStream.Position = 0;
+
+                        using (var fileStream = File.Create($"{fileFullPath}.jpg"))
+                        {
+                            await memoryStream.CopyToAsync(fileStream);
+                        }
+
+                    }
+                }
+                catch (Exception)
+                {
+
+                    continue;
+                }
+            }
+
+
+
+            return ResponseOutput.Ok();
+        }
+
+        public class AuToBindingStudyInfo
+        {
+            public Guid SCPStudyId { get; set; }
+            public DateTime? StudyTime { get; set; }
+        }
+
+        private async Task DealAutoBindingStudyAsync(Guid trialId, Guid subjectId, List<AuToBindingStudyInfo> studyList, decimal? startBindVisitNum = null)
+        {
+
+            //自动创建访视 和检查绑定
+
+            //1. 查询已存在的访视
+            var subjectAllVisitList = await _subjectVisitRepository.Where(t => t.SubjectId == subjectId)
+                .Select(t => new
+                {
+                    t.SubjectId,
+                    SubjectVisitId = t.Id,
+                    t.SubmitState,
+                    VisitNum = t.VisitNum,
+                    MaxStudyTime = t.SCPStudySubjectVisitList.Max(t => t.SCPStudy.StudyTime),
+                    MinStudyTime = t.SCPStudySubjectVisitList.Min(t => t.SCPStudy.StudyTime)
+                })
+                .ToListAsync();
+
+
+            //2、获取项目配置
+            var trialconfig = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.BlindBaseLineName, t.BlindFollowUpPrefix }).FirstOrDefault();
+
+            //3、 未提交的最小的访视号  从这个访视开始绑定
+
+            decimal subjectMaxVisitNum = 0;
+
+            if (startBindVisitNum == null)
+            {
+                if (subjectAllVisitList.Any(t => t.SubmitState != SubmitStateEnum.Submitted))
+                {
+                    subjectMaxVisitNum = subjectAllVisitList.Where(t => t.SubmitState != SubmitStateEnum.Submitted).MinOrDefault(t => t.VisitNum);
+                }
+                else
+                {
+                    //没有未提交的，那么开始绑定的就是已提交的加1
+                    subjectMaxVisitNum = subjectAllVisitList.Any() ? subjectAllVisitList.Last().VisitNum + 1 : 0;
+                }
+            }
+            else
+            {
+                subjectMaxVisitNum = startBindVisitNum.Value;
+            }
+
+            //var subjectMaxVisitNum = startBindVisitNum == null ? subjectAllVisitList.Where(t => t.SubmitState != SubmitStateEnum.Submitted).MinOrDefault(t => t.VisitNum) : startBindVisitNum.Value;
+
+
+            List<(int VisitCount, Guid SCPStudyId)> visits = new List<(int, Guid)>();
+
+            int visitCount = 0;
+
+            DateTime? lastVisitTime = null;
+
+            foreach (var study in studyList)
+            {
+                if (lastVisitTime == null || (study.StudyTime - lastVisitTime.Value).Value.TotalDays >= 15)
+                {
+                    // 当前时间点与上一个访视时间点间隔大于等于 15 天，需要建立一个新的访视
+                    visitCount++;
+
+                    visits.Add((visitCount, study.SCPStudyId));
+                }
+                else
+                {
+                    visits.Add((visitCount, study.SCPStudyId));
+                }
+
+                lastVisitTime = study.StudyTime;
+            }
+
+            //4、生成访视  并且绑定
+
+            for (int i = 0; i < visitCount; i++)
+            {
+
+                var bindSubjectVisitId = Guid.Empty;
+
+                var bindVisitNum = i + subjectMaxVisitNum;
+
+                var existSubjectVisit = subjectAllVisitList.FirstOrDefault(t => t.SubjectId == subjectId && t.VisitNum == bindVisitNum);
+
+                if (existSubjectVisit == null)
+                {
+                    bindSubjectVisitId = NewId.NextGuid();
+
+                    //基线
+                    if (bindVisitNum == 0)
+                    {
+
+                        await _subjectVisitRepository.AddAsync(new SubjectVisit() { TrialId = trialId, SubjectId = subjectId, VisitName = trialconfig.BlindBaseLineName, VisitNum = bindVisitNum, Id = bindSubjectVisitId, SubmitState = SubmitStateEnum.ToSubmit, IsBaseLine = true });
+
+                    }
+                    else
+                    {
+                        await _subjectVisitRepository.AddAsync(new SubjectVisit() { TrialId = trialId, SubjectId = subjectId, VisitName = trialconfig.BlindFollowUpPrefix + $" {(int)bindVisitNum}", VisitNum = bindVisitNum, Id = bindSubjectVisitId, SubmitState = SubmitStateEnum.ToSubmit });
+                    }
+                }
+
+                else
+                {
+                    bindSubjectVisitId = existSubjectVisit.SubjectVisitId;
+                }
+
+
+
+                var currentVisitStudyList = visits.Where(t => t.VisitCount == (i + 1)).ToList();
+
+                foreach (var item in currentVisitStudyList)
+                {
+                    //访视状态为未提交才绑定
+                    if (!subjectAllVisitList.Any(t => t.SubjectId == subjectId && t.SubjectVisitId == bindSubjectVisitId && t.SubmitState == SubmitStateEnum.Submitted))
+                    {
+                        var find = await _subjectVisitRepository.FindAsync(bindSubjectVisitId);
+                        find.SubmitState = SubmitStateEnum.ToSubmit;
+                        await _studySubjectVisitRepository.AddAsync(new SCPStudySubjectVisit() { TrialId = trialId, SubjectVisitId = bindSubjectVisitId, SCPStudyId = item.SCPStudyId, SubjectId = subjectId });
+
+                    }
+
+                }
+
+
+            }
+
+
+            await _subjectPatientRepository.SaveChangesAsync();
+        }
+
+
+        /// <summary>
+        /// 传输完成后，自动给检查绑定访视
+        /// </summary>
+        /// <param name="inCommand"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IResponseOutput> AutoBindingPatientStudyVisitAsync(List<Guid> scpStudyIdList)
+        {
+            //一个检查 可能绑定到不同的项目的不同subject  有的该检查已绑定访视，有的该检查绑定了访视
+
+            var query = from scpStudy in _studyRepository.Where(t => scpStudyIdList.Contains(t.Id))
+                        join subjectPatient in _subjectPatientRepository.AsQueryable()
+                        on scpStudy.PatientId equals subjectPatient.PatientId
+                        select new
+                        {
+                            subjectPatient.Subject.Status,
+                            subjectPatient.Subject.TrialId,
+                            subjectPatient.SubjectId,
+                            subjectPatient.PatientId,
+                            SCPStudyId = scpStudy.Id,
+                            scpStudy.StudyTime
+                        };
+
+            var list = query.ToList();
+
+            if (list.Count > 0)
+            {
+
+
+                var subjectIdList = list.Select(t => t.SubjectId).ToList();
+
+                var allSubjectVisitList = await _subjectVisitRepository.Where(t => subjectIdList.Contains(t.SubjectId))
+                    .Select(t => new { t.SubjectId, SubjectVisitId = t.Id, t.SubmitState, VisitNum = t.VisitNum, MaxStudyTime = t.SCPStudySubjectVisitList.Max(t => t.SCPStudy.StudyTime), MinStudyTime = t.SCPStudySubjectVisitList.Min(t => t.SCPStudy.StudyTime) })
+                    .ToListAsync();
+
+                foreach (var g in list.GroupBy(t => new { t.SubjectId, t.TrialId, t.Status }))
+                {
+                    var subjectId = g.Key.SubjectId;
+                    var trialId = g.Key.TrialId;
+
+                    //访视结束，那么就不处理
+                    if (g.Key.Status == SubjectStatus.EndOfVisit)
+                    {
+                        continue;
+                    }
+
+
+                    // 预先处理1： 数据库可能有已存在的subject 患者绑定，在这里要一起考虑绑定
+
+                    var dbPatientIdList = _subjectPatientRepository.Where(t => t.SubjectId == subjectId).Select(t => t.PatientId).ToList();
+
+                    // 预先处理2： 删除未提交的所有绑定的检查记录，所有检查一起考虑绑定
+
+                    await _studySubjectVisitRepository.BatchDeleteNoTrackingAsync(t => t.SubjectId == subjectId && t.SubjectVisit.SubmitState != SubmitStateEnum.Submitted);
+
+                    //预处理3 找到该subjecct 已提交的访视的最大检查时间，绑定的检查时间要比这个时间要大
+
+                    var maxStudyTime = allSubjectVisitList.Where(t => t.SubjectId == subjectId && t.SubmitState == SubmitStateEnum.Submitted).MaxOrDefault(t => t.MaxStudyTime);
+
+
+                    // 预处理4： 处理需要绑定的检查
+                    //获取 该受试者绑定患者已存在的检查，考虑要生成多少个访视，去除已提交的检查  
+
+                    var studyList = await _studyRepository.Where(t => dbPatientIdList.Contains(t.PatientId)
+                    && !t.SCPStudySubjectVisitList.Any(t => t.SubjectId == subjectId && t.SubjectVisit.SubmitState == SubmitStateEnum.Submitted))
+                        .WhereIf(maxStudyTime != null, t => t.StudyTime > maxStudyTime)
+                        .Select(t => new AuToBindingStudyInfo { SCPStudyId = t.Id, StudyTime = t.StudyTime }).OrderBy(t => t.StudyTime).ToListAsync();
+
+                    await DealAutoBindingStudyAsync(trialId, subjectId, studyList);
+
+
+                }
+
+                await _subjectVisitRepository.SaveChangesAsync();
+            }
+
+            //将检查设置为传输结束
+            await _studyRepository.BatchUpdateNoTrackingAsync(t => scpStudyIdList.Contains(t.Id), u => new SCPStudy() { IsUploadFinished = true });
+
+            return ResponseOutput.Ok();
+
+        }
+
+    }
+}

IRC.Core.SCP/appsettings.Prod_HIR_SCP.json

@@ -0,0 +1,37 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "ObjectStoreService": {
+    "ObjectStoreUse": "MinIO",
+    "MinIO": {
+      "EndPoint": "47.102.87.183",
+      "Port": "9000",
+      "UseSSL": false,
+      "AccessKeyId": "fbStsVYCIPKHQneeqMwD",
+      "SecretAccessKey": "TzgvyA3zGXMUnpilJNUlyMYHfosl1hBMl6lxPmjy",
+      "BucketName": "hir-images",
+      "ViewEndpoint": "http://47.102.87.18:9001/hir-images/"
+    }
+  },
+
+  "ConnectionStrings": {
+    "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": {
+    "IsUploadImageAnonymization": true,
+    "IsSupportThirdService": true,
+    "IsForwardImageMultiThread": true,
+    "MultiThreadCount": 10,
+    "CalledAEList": [
+      "HIRAE",
+      "STORESCP"
+    ],
+    "ServerPort": 11115
+  }
+}

IRC.Core.SCP/appsettings.Prod_IRC_SCP.json

@@ -1,37 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ObjectStoreService": {
-    "ObjectStoreUse": "AliyunOSS",
-    "AliyunOSS": {
-      "RegionId": "cn-shanghai",
-      "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
-      "EndPoint": "https://oss-cn-shanghai.aliyuncs.com",
-      "AccessKeyId": "LTAI5tNRTsqL6aWmHkDmTwoH",
-      "AccessKeySecret": "7mtGz3qrYWI6JMMBZiLeC119VWicZH",
-      "RoleArn": "acs:ram::1899121822495495:role/irc-oss-access",
-      "BucketName": "zy-irc-store",
-      "ViewEndpoint": "https://zy-irc-cache.oss-cn-shanghai.aliyuncs.com",
-      "Region": "oss-cn-shanghai",
-      "DurationSeconds": 7200
-    }
-  },
-
-  "ConnectionStrings": {
-    "RemoteNew": "Server=prod_mssql_standard,1433;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
-    "Hangfire": "Server=prod_mssql_standard,1433;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
-  },
-
-  "DicomSCPServiceConfig": {
-    "CalledAEList": [
-      "STORESCP"
-    ],
-    "ServerPort": 11112
-  }
-
-}

IRC.Core.SCP/appsettings.TJ_Prod_HIR_SCP.json

@@ -0,0 +1,35 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "ObjectStoreService": {
+    "ObjectStoreUse": "MinIO",
+    "MinIO": {
+      "EndPoint": "192.168.40.99",
+      "Port": "9000",
+      "UseSSL": false,
+      "AccessKeyId": "Jnywl9aIw83yewZIJKod",
+      "SecretAccessKey": "N83bTzoJGkg4OLW8x54IZRwwSvdxcdYi9UZ2BYII",
+      "BucketName": "tj-hir",
+      "ViewEndpoint": "http://192.168.40.99:9000/tj-hir"
+    }
+  },
+
+  "ConnectionStrings": {
+    "RemoteNew": "Server=192.168.40.98,1433;Database=TJ_Prod_HIR;User ID=sa;Password=xc_123456;TrustServerCertificate=true",
+    "Hangfire": "Server=192.168.40.98,1433;Database=TJ_Prod_HIR_Hangfire;User ID=sa;Password=xc_123456;TrustServerCertificate=true"
+  },
+  "DicomSCPServiceConfig": {
+    "CalledAEList": [
+      "STORESCP",
+      "HIRAE",
+      "Value2",
+      "Value3"
+    ],
+    "ServerPort": 11112
+  }
+}

IRC.Core.SCP/appsettings.Test_HIR_SCP.json

@@ -0,0 +1,37 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "ObjectStoreService": {
+    "ObjectStoreUse": "MinIO",
+    "MinIO": {
+      "EndPoint": "106.14.89.110",
+      "Port": "9001",
+      "UseSSL": false,
+      "AccessKeyId": "fbStsVYCIPKHQneeqMwD",
+      "SecretAccessKey": "TzgvyA3zGXMUnpilJNUlyMYHfosl1hBMl6lxPmjy",
+      "BucketName": "hir-test",
+      "ViewEndpoint": "http://106.14.89.110:9001/hir-test/"
+    }
+  },
+
+  "ConnectionStrings": {
+    "RemoteNew": "Server=106.14.89.110,1435;Database=Test_HIR_New;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    "Hangfire": "Server=106.14.89.110,1435;Database=Test_HIR_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
+  },
+  "DicomSCPServiceConfig": {
+    "IsUploadImageAnonymization": false,
+    "IsSupportThirdService": true,
+    "IsForwardImageMultiThread": true,
+    "MultiThreadCount": 10,
+    "CalledAEList": [
+      "HIRAE",
+      "STORESCP"
+    ],
+    "ServerPort": 11115
+  }
+}

IRC.Core.SCP/appsettings.Test_IRC_SCP.json

@@ -1,48 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ObjectStoreService": {
-    "ObjectStoreUse": "AliyunOSS",
-    "AliyunOSS": {
-      "RegionId": "cn-shanghai",
-      "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
-      "EndPoint": "https://oss-cn-shanghai.aliyuncs.com",
-      "AccessKeyId": "LTAI5tRRZehUp2V9pyTPtAJm",
-      "AccessKeySecret": "FLizxkHsMm4CGYHtkV8E3PNJJZU7oV",
-      "RoleArn": "acs:ram::1899121822495495:role/dev-oss-access",
-      "BucketName": "zy-irc-test-store",
-      "ViewEndpoint": "https://zy-irc-test-store.oss-cn-shanghai.aliyuncs.com",
-      "Region": "oss-cn-shanghai",
-      "DurationSeconds": 7200
-    },
-
-    "MinIO": {
-      "endPoint": "106.14.89.110",
-      "port": "9001",
-      "useSSL": false,
-      "accessKey": "fbStsVYCIPKHQneeqMwD",
-      "secretKey": "TzgvyA3zGXMUnpilJNUlyMYHfosl1hBMl6lxPmjy",
-      "bucketName": "hir-test",
-      "viewEndpoint": "http://106.14.89.110:9001/hir-test/"
-    }
-
-  },
-
-  "ConnectionStrings": {
-    "RemoteNew": "Server=106.14.89.110,1435;Database=Test_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    "Hangfire": "Server=106.14.89.110,1435;Database=Test_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
-  },
-
-  "DicomSCPServiceConfig": {
-    "CalledAEList": [
-      "STORESCP"
-    ],
-    "ServerPort": 11112
-  }
-
-}

IRC.Core.SCP/appsettings.US_HIR_SCP.json

@@ -0,0 +1,37 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "ObjectStoreService": {
+    "ObjectStoreUse": "MinIO",
+    "MinIO": {
+      "EndPoint": "3.226.182.187",
+      "Port": "9001",
+      "UseSSL": false,
+      "AccessKeyId": "7rvVIHs7D6pbyscRcJhz",
+      "SecretAccessKey": "DQsCQldHFL3QRjlnaLWV7oM4E9PtsO21QPC2h9BD",
+      "BucketName": "hir-us",
+      "ViewEndpoint": "http://hir-minio.uat.elevateimaging.ai/hir-us"
+    }
+  },
+
+  "ConnectionStrings": {
+    "RemoteNew": "Server=3.226.182.187,1435;Database=US_HIR;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    "Hangfire": "Server=3.226.182.187,1435;Database=US_HIR_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
+  },
+  "DicomSCPServiceConfig": {
+    "IsUploadImageAnonymization": true,
+    "IsSupportThirdService": true,
+    "IsForwardImageMultiThread": true,
+    "MultiThreadCount": 10,
+    "CalledAEList": [
+      "STORESCP",
+      "HIRAE"
+    ],
+    "ServerPort": 11115
+  }
+}

IRC.Core.SCP/appsettings.US_Prod_SCP.json

@@ -1,34 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ObjectStoreService": {
-    "ObjectStoreUse": "AWS",
-    "AWS": {
-      "Region": "us-east-1",
-      "EndPoint": "s3.us-east-1.amazonaws.com",
-      "UseSSL": true,
-      "RoleArn": "arn:aws:iam::471112624751:role/lili_s3_access",
-      "AccessKeyId": "AKIAW3MEAFJXZ2TZK7GM",
-      "SecretAccessKey": "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",
-      "BucketName": "ei-med-s3-lili-store",
-      "ViewEndpoint": "https://ei-med-s3-lili-store.s3.amazonaws.com",
-      "DurationSeconds": 7200
-    }
-  },
-  "ConnectionStrings": {
-    "RemoteNew": "Server=us-mssql-prod,1433;Database=US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    "Hangfire": "Server=us-mssql-prod,1433;Database=US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
-  },
-  "DicomSCPServiceConfig": {
-    "CalledAEList": [
-      "STORESCP"
-    ],
-    "ServerPort": 11112
-  }
-
-}

IRC.Core.SCP/appsettings.US_Uat_SCP.json

@@ -1,34 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ObjectStoreService": {
-    "ObjectStoreUse": "AWS",
-    "AWS": {
-      "Region": "us-east-1",
-      "EndPoint": "s3.us-east-1.amazonaws.com",
-      "UseSSL": true,
-      "RoleArn": "arn:aws:iam::471112624751:role/uat_s3_access",
-      "AccessKeyId": "AKIAW3MEAFJX7IPXISP4",
-      "SecretAccessKey": "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",
-      "BucketName": "ei-med-s3-lili-uat-store",
-      "ViewEndpoint": "https://ei-med-s3-lili-uat-store.s3.amazonaws.com/",
-      "DurationSeconds": 7200
-    }
-  },
-  "ConnectionStrings": {
-    "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"
-  },
-  "DicomSCPServiceConfig": {
-    "CalledAEList": [
-      "STORESCP"
-    ],
-    "ServerPort": 11112
-  }
-
-}

IRC.Core.SCP/appsettings.Uat_HIR_SCP.json

@@ -0,0 +1,37 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "ObjectStoreService": {
+    "ObjectStoreUse": "MinIO",
+    "MinIO": {
+      "EndPoint": "101.132.253.119",
+      "Port": "9001",
+      "UseSSL": false,
+      "AccessKeyId": "ylWQa99fDdVdTfnj47ll",
+      "SecretAccessKey": "kVpy2RIYN0GmyFsU2qAWhbKDf4Nskt23tEqd6sob",
+      "BucketName": "hir-uat",
+      "ViewEndpoint": "http://101.132.253.119:9001/hir-uat/"
+    }
+  },
+
+  "ConnectionStrings": {
+    "RemoteNew": "Server=101.132.253.119,1435;Database=Uat_HIR_New;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    "Hangfire": "Server=101.132.253.119,1435;Database=Uat_HIR_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
+  },
+  "DicomSCPServiceConfig": {
+    "IsUploadImageAnonymization": true,
+    "IsSupportThirdService": true,
+    "IsForwardImageMultiThread": true,
+    "MultiThreadCount": 10,
+    "CalledAEList": [
+      "STORESCP",
+      "HIRAE"
+    ],
+    "ServerPort": 11115
+  }
+}

IRC.Core.SCP/appsettings.Uat_IRC_SCP.json

@@ -1,35 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ObjectStoreService": {
-    "ObjectStoreUse": "AliyunOSS",
-    "AliyunOSS": {
-      "RegionId": "cn-shanghai",
-      "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
-      "EndPoint": "https://oss-cn-shanghai.aliyuncs.com",
-      "AccessKeyId": "LTAI5tFUCCmz5TwghZHsj45Y",
-      "AccessKeySecret": "8evrBy1fVfzJG25i67Jm0xqn9Xcw2T",
-      "RoleArn": "acs:ram::1078130221702011:role/uat-oss-access",
-      "BucketName": "tl-med-irc-uat-store",
-      "ViewEndpoint": "https://tl-med-irc-uat-store.oss-cn-shanghai.aliyuncs.com",
-      "Region": "oss-cn-shanghai",
-      "DurationSeconds": 7200
-    }
-  },
-  "ConnectionStrings": {
-    "RemoteNew": "Server=101.132.253.119,1435;Database=Uat_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    "Hangfire": "Server101.132.253.119,1435;Database=Uat_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
-  },
-  "DicomSCPServiceConfig": {
-    "CalledAEList": [
-      "STORESCP"
-    ],
-    "ServerPort": 11112
-  }
-
-}

IRC.Core.SCP/wwwroot/swagger/ui/Index.html

@@ -0,0 +1,128 @@
+<!-- HTML for static distribution bundle build -->
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>%(DocumentTitle)</title>
+    <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700" rel="stylesheet">
+    <link rel="stylesheet" type="text/css" href="./swagger-ui.css">
+    <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
+    <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
+    <style>
+
+        html {
+            box-sizing: border-box;
+            overflow: -moz-scrollbars-vertical;
+            overflow-y: scroll;
+        }
+
+        *,
+        *:before,
+        *:after {
+            box-sizing: inherit;
+        }
+
+        body {
+            margin: 0;
+            background: #fafafa;
+        }
+    </style>
+    %(HeadContent)
+</head>
+<body>
+    <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position:absolute;width:0;height:0">
+        <defs>
+            <symbol viewBox="0 0 20 20" id="unlocked">
+                <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>
+            </symbol>
+            <symbol viewBox="0 0 20 20" id="locked">
+                <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8zM12 8H8V5.199C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8z" />
+            </symbol>
+            <symbol viewBox="0 0 20 20" id="close">
+                <path d="M14.348 14.849c-.469.469-1.229.469-1.697 0L10 11.819l-2.651 3.029c-.469.469-1.229.469-1.697 0-.469-.469-.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-.469-.469-.469-1.228 0-1.697.469-.469 1.228-.469 1.697 0L10 8.183l2.651-3.031c.469-.469 1.228-.469 1.697 0 .469.469.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c.469.469.469 1.229 0 1.698z" />
+            </symbol>
+            <symbol viewBox="0 0 20 20" id="large-arrow">
+                <path d="M13.25 10L6.109 2.58c-.268-.27-.268-.707 0-.979.268-.27.701-.27.969 0l7.83 7.908c.268.271.268.709 0 .979l-7.83 7.908c-.268.271-.701.27-.969 0-.268-.269-.268-.707 0-.979L13.25 10z" />
+            </symbol>
+            <symbol viewBox="0 0 20 20" id="large-arrow-down">
+                <path d="M17.418 6.109c.272-.268.709-.268.979 0s.271.701 0 .969l-7.908 7.83c-.27.268-.707.268-.979 0l-7.908-7.83c-.27-.268-.27-.701 0-.969.271-.268.709-.268.979 0L10 13.25l7.418-7.141z" />
+            </symbol>
+
+            <symbol viewBox="0 0 24 24" id="jump-to">
+                <path d="M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z" />
+            </symbol>
+            <symbol viewBox="0 0 24 24" id="expand">
+                <path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z" />
+            </symbol>
+        </defs>
+    </svg>
+    <div id="swagger-ui"></div>
+    <script src="./swagger-ui-bundle.js"></script>
+    <script src="./swagger-ui-standalone-preset.js"></script>
+    <script src="/swagger/ui/abp.js"></script>
+    <script src="/swagger/ui/abp.swagger.js?v=1"></script>
+    <!--<script src="/lib/jquery/jquery.min.js"></script>-->
+    <script>
+        window.onload = function () {
+            var configObject = JSON.parse('%(ConfigObject)');
+
+            // Apply mandatory parameters
+            configObject.dom_id = "#swagger-ui";
+            configObject.presets = [SwaggerUIBundle.presets.apis, SwaggerUIStandalonePreset];
+            configObject.layout = "StandaloneLayout";
+            configObject.requestInterceptor = function (request) {
+                request.headers.Authorization = "Bearer " + abp.auth.getToken();
+                return request;
+            };
+            if (!configObject.hasOwnProperty("oauth2RedirectUrl")) {
+                configObject.oauth2RedirectUrl = window.location + "oauth2-redirect.html"; // use the built-in default
+            }
+            function getAuthorizeButtonText() {
+                return abp.auth.getToken() ? 'Logout' : 'Authorize';
+            }
+            function getAuthorizeButtonCssClass() {
+                return abp.auth.getToken() ? 'cancel' : 'authorize';
+            }
+            configObject.plugins = [
+                function (system) {
+                    return {
+                        components: {
+                            authorizeBtn: function () {
+                                return system.React.createElement("button",
+                                    {
+                                        id: "authorize",
+                                        className: "btn " + getAuthorizeButtonCssClass(),
+                                        style: {
+                                            lineHeight: "normal"
+                                        },
+                                        onClick: function () {
+                                            var authorizeButton = document.getElementById('authorize');
+                                            if (abp.auth.getToken()) {
+                                                abp.swagger.logout();
+                                                authorizeButton.innerText = getAuthorizeButtonText();
+                                                authorizeButton.className = 'btn ' + getAuthorizeButtonCssClass();
+                                            } else {
+                                                abp.swagger.openAuthDialog(function () {
+                                                    authorizeButton.innerText = getAuthorizeButtonText();
+                                                    authorizeButton.className = 'btn ' + getAuthorizeButtonCssClass();
+                                                    abp.swagger.closeAuthDialog();
+                                                });
+                                            }
+                                        }
+                                    }, getAuthorizeButtonText());
+                            }, info: function () {
+                                return null;
+                            }
+                        }
+
+                    }
+                }
+            ];
+            // Build a system
+            SwaggerUIBundle(configObject);
+
+
+
+        }</script>
+</body>
+</html>

IRC.Core.SCP/wwwroot/swagger/ui/abp.js

@@ -0,0 +1,117 @@
+var abp = abp || {};
+(function () {
+
+    /* Application paths *****************************************/
+
+    // Current application root path (including virtual directory if exists).
+    abp.appPath = abp.appPath || '/';
+
+    /* AUTHORIZATION **********************************************/
+    // Implements Authorization API that simplifies usage of authorization scripts generated by Abp.
+
+    abp.auth = abp.auth || {};
+
+    abp.auth.tokenCookieName = 'Abp.AuthToken';
+    abp.auth.tokenHeaderName = 'Authorization';
+
+    abp.auth.setToken = function (authToken, expireDate) {
+        abp.utils.setCookieValue(abp.auth.tokenCookieName, authToken, expireDate, abp.appPath);
+    };
+
+    abp.auth.getToken = function () {
+        return abp.utils.getCookieValue(abp.auth.tokenCookieName);
+    }
+
+    abp.auth.clearToken = function () {
+        abp.auth.setToken();
+    }
+
+    /* UTILS ***************************************************/
+
+    abp.utils = abp.utils || {};
+
+    /**
+         * Sets a cookie value for given key.
+         * This is a simple implementation created to be used by ABP.
+         * Please use a complete cookie library if you need.
+         * @param {string} key
+         * @param {string} value
+         * @param {Date} expireDate (optional). If not specified the cookie will expire at the end of session.
+         * @param {string} path (optional)
+         */
+    abp.utils.setCookieValue = function (key, value, expireDate, path) {
+        var cookieValue = encodeURIComponent(key) + '=';
+
+        if (value) {
+            cookieValue = cookieValue + encodeURIComponent(value);
+        }
+
+        if (expireDate) {
+            cookieValue = cookieValue + "; expires=" + expireDate.toUTCString();
+        }
+
+        if (path) {
+            cookieValue = cookieValue + "; path=" + path;
+        }
+
+        document.cookie = cookieValue;
+    };
+
+    /**
+     * Gets a cookie with given key.
+     * This is a simple implementation created to be used by ABP.
+     * Please use a complete cookie library if you need.
+     * @param {string} key
+     * @returns {string} Cookie value or null
+     */
+    abp.utils.getCookieValue = function (key) {
+        var equalities = document.cookie.split('; ');
+        for (var i = 0; i < equalities.length; i++) {
+            if (!equalities[i]) {
+                continue;
+            }
+
+            var splitted = equalities[i].split('=');
+            if (splitted.length != 2) {
+                continue;
+            }
+
+            if (decodeURIComponent(splitted[0]) === key) {
+                return decodeURIComponent(splitted[1] || '');
+            }
+        }
+
+        return null;
+    };
+
+    /**
+     * Deletes cookie for given key.
+     * This is a simple implementation created to be used by ABP.
+     * Please use a complete cookie library if you need.
+     * @param {string} key
+     * @param {string} path (optional)
+     */
+    abp.utils.deleteCookie = function (key, path) {
+        var cookieValue = encodeURIComponent(key) + '=';
+
+        cookieValue = cookieValue + "; expires=" + (new Date(new Date().getTime() - 86400000)).toUTCString();
+
+        if (path) {
+            cookieValue = cookieValue + "; path=" + path;
+        }
+
+        document.cookie = cookieValue;
+    }
+
+    /* SECURITY ***************************************/
+    abp.security = abp.security || {};
+    abp.security.antiForgery = abp.security.antiForgery || {};
+
+    abp.security.antiForgery.tokenCookieName = 'XSRF-TOKEN';
+    abp.security.antiForgery.tokenHeaderName = 'X-XSRF-TOKEN';
+
+    abp.security.antiForgery.getToken = function () {
+        return abp.utils.getCookieValue(abp.security.antiForgery.tokenCookieName);
+    };
+
+})();

IRC.Core.SCP/wwwroot/swagger/ui/abp.swagger.js

@@ -0,0 +1,597 @@
+var abp = abp || {};
+(function () {
+
+    /* md5*/
+
+    /*
+ * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
+ * Digest Algorithm, as defined in RFC 1321.
+ * Version 2.1 Copyright (C) Paul Johnston 1999 - 2002.
+ * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+ * Distributed under the BSD License
+ * See http://pajhome.org.uk/crypt/md5 for more info.
+ */
+
+    /*
+     * Configurable variables. You may need to tweak these to be compatible with
+     * the server-side, but the defaults work in most cases.
+     */
+    var hexcase = 0;  /* hex output format. 0 - lowercase; 1 - uppercase        */
+    var b64pad = ""; /* base-64 pad character. "=" for strict RFC compliance   */
+    var chrsz = 8;  /* bits per input character. 8 - ASCII; 16 - Unicode      */
+
+    /*
+     * These are the functions you'll usually want to call
+     * They take string arguments and return either hex or base-64 encoded strings
+     */
+    function hex_md5(s) { return binl2hex(core_md5(str2binl(s), s.length * chrsz)); }
+    function b64_md5(s) { return binl2b64(core_md5(str2binl(s), s.length * chrsz)); }
+    function str_md5(s) { return binl2str(core_md5(str2binl(s), s.length * chrsz)); }
+    function hex_hmac_md5(key, data) { return binl2hex(core_hmac_md5(key, data)); }
+    function b64_hmac_md5(key, data) { return binl2b64(core_hmac_md5(key, data)); }
+    function str_hmac_md5(key, data) { return binl2str(core_hmac_md5(key, data)); }
+
+    /*
+     * Perform a simple self-test to see if the VM is working
+     */
+    function md5_vm_test() {
+        return hex_md5("abc") == "900150983cd24fb0d6963f7d28e17f72";
+    }
+
+    /*
+     * Calculate the MD5 of an array of little-endian words, and a bit length
+     */
+    function core_md5(x, len) {
+        /* append padding */
+        x[len >> 5] |= 0x80 << ((len) % 32);
+        x[(((len + 64) >>> 9) << 4) + 14] = len;
+
+        var a = 1732584193;
+        var b = -271733879;
+        var c = -1732584194;
+        var d = 271733878;
+
+        for (var i = 0; i < x.length; i += 16) {
+            var olda = a;
+            var oldb = b;
+            var oldc = c;
+            var oldd = d;
+
+            a = md5_ff(a, b, c, d, x[i + 0], 7, -680876936);
+            d = md5_ff(d, a, b, c, x[i + 1], 12, -389564586);
+            c = md5_ff(c, d, a, b, x[i + 2], 17, 606105819);
+            b = md5_ff(b, c, d, a, x[i + 3], 22, -1044525330);
+            a = md5_ff(a, b, c, d, x[i + 4], 7, -176418897);
+            d = md5_ff(d, a, b, c, x[i + 5], 12, 1200080426);
+            c = md5_ff(c, d, a, b, x[i + 6], 17, -1473231341);
+            b = md5_ff(b, c, d, a, x[i + 7], 22, -45705983);
+            a = md5_ff(a, b, c, d, x[i + 8], 7, 1770035416);
+            d = md5_ff(d, a, b, c, x[i + 9], 12, -1958414417);
+            c = md5_ff(c, d, a, b, x[i + 10], 17, -42063);
+            b = md5_ff(b, c, d, a, x[i + 11], 22, -1990404162);
+            a = md5_ff(a, b, c, d, x[i + 12], 7, 1804603682);
+            d = md5_ff(d, a, b, c, x[i + 13], 12, -40341101);
+            c = md5_ff(c, d, a, b, x[i + 14], 17, -1502002290);
+            b = md5_ff(b, c, d, a, x[i + 15], 22, 1236535329);
+
+            a = md5_gg(a, b, c, d, x[i + 1], 5, -165796510);
+            d = md5_gg(d, a, b, c, x[i + 6], 9, -1069501632);
+            c = md5_gg(c, d, a, b, x[i + 11], 14, 643717713);
+            b = md5_gg(b, c, d, a, x[i + 0], 20, -373897302);
+            a = md5_gg(a, b, c, d, x[i + 5], 5, -701558691);
+            d = md5_gg(d, a, b, c, x[i + 10], 9, 38016083);
+            c = md5_gg(c, d, a, b, x[i + 15], 14, -660478335);
+            b = md5_gg(b, c, d, a, x[i + 4], 20, -405537848);
+            a = md5_gg(a, b, c, d, x[i + 9], 5, 568446438);
+            d = md5_gg(d, a, b, c, x[i + 14], 9, -1019803690);
+            c = md5_gg(c, d, a, b, x[i + 3], 14, -187363961);
+            b = md5_gg(b, c, d, a, x[i + 8], 20, 1163531501);
+            a = md5_gg(a, b, c, d, x[i + 13], 5, -1444681467);
+            d = md5_gg(d, a, b, c, x[i + 2], 9, -51403784);
+            c = md5_gg(c, d, a, b, x[i + 7], 14, 1735328473);
+            b = md5_gg(b, c, d, a, x[i + 12], 20, -1926607734);
+
+            a = md5_hh(a, b, c, d, x[i + 5], 4, -378558);
+            d = md5_hh(d, a, b, c, x[i + 8], 11, -2022574463);
+            c = md5_hh(c, d, a, b, x[i + 11], 16, 1839030562);
+            b = md5_hh(b, c, d, a, x[i + 14], 23, -35309556);
+            a = md5_hh(a, b, c, d, x[i + 1], 4, -1530992060);
+            d = md5_hh(d, a, b, c, x[i + 4], 11, 1272893353);
+            c = md5_hh(c, d, a, b, x[i + 7], 16, -155497632);
+            b = md5_hh(b, c, d, a, x[i + 10], 23, -1094730640);
+            a = md5_hh(a, b, c, d, x[i + 13], 4, 681279174);
+            d = md5_hh(d, a, b, c, x[i + 0], 11, -358537222);
+            c = md5_hh(c, d, a, b, x[i + 3], 16, -722521979);
+            b = md5_hh(b, c, d, a, x[i + 6], 23, 76029189);
+            a = md5_hh(a, b, c, d, x[i + 9], 4, -640364487);
+            d = md5_hh(d, a, b, c, x[i + 12], 11, -421815835);
+            c = md5_hh(c, d, a, b, x[i + 15], 16, 530742520);
+            b = md5_hh(b, c, d, a, x[i + 2], 23, -995338651);
+
+            a = md5_ii(a, b, c, d, x[i + 0], 6, -198630844);
+            d = md5_ii(d, a, b, c, x[i + 7], 10, 1126891415);
+            c = md5_ii(c, d, a, b, x[i + 14], 15, -1416354905);
+            b = md5_ii(b, c, d, a, x[i + 5], 21, -57434055);
+            a = md5_ii(a, b, c, d, x[i + 12], 6, 1700485571);
+            d = md5_ii(d, a, b, c, x[i + 3], 10, -1894986606);
+            c = md5_ii(c, d, a, b, x[i + 10], 15, -1051523);
+            b = md5_ii(b, c, d, a, x[i + 1], 21, -2054922799);
+            a = md5_ii(a, b, c, d, x[i + 8], 6, 1873313359);
+            d = md5_ii(d, a, b, c, x[i + 15], 10, -30611744);
+            c = md5_ii(c, d, a, b, x[i + 6], 15, -1560198380);
+            b = md5_ii(b, c, d, a, x[i + 13], 21, 1309151649);
+            a = md5_ii(a, b, c, d, x[i + 4], 6, -145523070);
+            d = md5_ii(d, a, b, c, x[i + 11], 10, -1120210379);
+            c = md5_ii(c, d, a, b, x[i + 2], 15, 718787259);
+            b = md5_ii(b, c, d, a, x[i + 9], 21, -343485551);
+
+            a = safe_add(a, olda);
+            b = safe_add(b, oldb);
+            c = safe_add(c, oldc);
+            d = safe_add(d, oldd);
+        }
+        return Array(a, b, c, d);
+
+    }
+
+    /*
+     * These functions implement the four basic operations the algorithm uses.
+     */
+    function md5_cmn(q, a, b, x, s, t) {
+        return safe_add(bit_rol(safe_add(safe_add(a, q), safe_add(x, t)), s), b);
+    }
+    function md5_ff(a, b, c, d, x, s, t) {
+        return md5_cmn((b & c) | ((~b) & d), a, b, x, s, t);
+    }
+    function md5_gg(a, b, c, d, x, s, t) {
+        return md5_cmn((b & d) | (c & (~d)), a, b, x, s, t);
+    }
+    function md5_hh(a, b, c, d, x, s, t) {
+        return md5_cmn(b ^ c ^ d, a, b, x, s, t);
+    }
+    function md5_ii(a, b, c, d, x, s, t) {
+        return md5_cmn(c ^ (b | (~d)), a, b, x, s, t);
+    }
+
+    /*
+     * Calculate the HMAC-MD5, of a key and some data
+     */
+    function core_hmac_md5(key, data) {
+        var bkey = str2binl(key);
+        if (bkey.length > 16) bkey = core_md5(bkey, key.length * chrsz);
+
+        var ipad = Array(16), opad = Array(16);
+        for (var i = 0; i < 16; i++) {
+            ipad[i] = bkey[i] ^ 0x36363636;
+            opad[i] = bkey[i] ^ 0x5C5C5C5C;
+        }
+
+        var hash = core_md5(ipad.concat(str2binl(data)), 512 + data.length * chrsz);
+        return core_md5(opad.concat(hash), 512 + 128);
+    }
+
+    /*
+     * Add integers, wrapping at 2^32. This uses 16-bit operations internally
+     * to work around bugs in some JS interpreters.
+     */
+    function safe_add(x, y) {
+        var lsw = (x & 0xFFFF) + (y & 0xFFFF);
+        var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
+        return (msw << 16) | (lsw & 0xFFFF);
+    }
+
+    /*
+     * Bitwise rotate a 32-bit number to the left.
+     */
+    function bit_rol(num, cnt) {
+        return (num << cnt) | (num >>> (32 - cnt));
+    }
+
+    /*
+     * Convert a string to an array of little-endian words
+     * If chrsz is ASCII, characters >255 have their hi-byte silently ignored.
+     */
+    function str2binl(str) {
+        var bin = Array();
+        var mask = (1 << chrsz) - 1;
+        for (var i = 0; i < str.length * chrsz; i += chrsz)
+            bin[i >> 5] |= (str.charCodeAt(i / chrsz) & mask) << (i % 32);
+        return bin;
+    }
+
+    /*
+     * Convert an array of little-endian words to a string
+     */
+    function binl2str(bin) {
+        var str = "";
+        var mask = (1 << chrsz) - 1;
+        for (var i = 0; i < bin.length * 32; i += chrsz)
+            str += String.fromCharCode((bin[i >> 5] >>> (i % 32)) & mask);
+        return str;
+    }
+
+    /*
+     * Convert an array of little-endian words to a hex string.
+     */
+    function binl2hex(binarray) {
+        var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
+        var str = "";
+        for (var i = 0; i < binarray.length * 4; i++) {
+            str += hex_tab.charAt((binarray[i >> 2] >> ((i % 4) * 8 + 4)) & 0xF) +
+                hex_tab.charAt((binarray[i >> 2] >> ((i % 4) * 8)) & 0xF);
+        }
+        return str;
+    }
+
+    /*
+     * Convert an array of little-endian words to a base-64 string
+     */
+    function binl2b64(binarray) {
+        var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+        var str = "";
+        for (var i = 0; i < binarray.length * 4; i += 3) {
+            var triplet = (((binarray[i >> 2] >> 8 * (i % 4)) & 0xFF) << 16)
+                | (((binarray[i + 1 >> 2] >> 8 * ((i + 1) % 4)) & 0xFF) << 8)
+                | ((binarray[i + 2 >> 2] >> 8 * ((i + 2) % 4)) & 0xFF);
+            for (var j = 0; j < 4; j++) {
+                if (i * 8 + j * 6 > binarray.length * 32) str += b64pad;
+                else str += tab.charAt((triplet >> 6 * (3 - j)) & 0x3F);
+            }
+        }
+        return str;
+    }
+
+
+    /* Swagger */
+
+    abp.swagger = abp.swagger || {};
+
+    abp.swagger.addAuthToken = function () {
+        var authToken = abp.auth.getToken();
+        if (!authToken) {
+            return false;
+        }
+
+        var cookieAuth = new SwaggerClient.ApiKeyAuthorization(abp.auth.tokenHeaderName, 'Bearer ' + authToken, 'header');
+        swaggerUi.api.clientAuthorizations.add('bearerAuth', cookieAuth);
+        return true;
+    }
+
+    abp.swagger.addCsrfToken = function () {
+        var csrfToken = abp.security.antiForgery.getToken();
+        if (!csrfToken) {
+            return false;
+        }
+        var csrfCookieAuth = new SwaggerClient.ApiKeyAuthorization(abp.security.antiForgery.tokenHeaderName, csrfToken, 'header');
+        swaggerUi.api.clientAuthorizations.add(abp.security.antiForgery.tokenHeaderName, csrfCookieAuth);
+        return true;
+    }
+
+    function loginUserInternal(tenantId, callback) {
+
+        var usernameOrEmailAddress = document.getElementById('userName').value;
+        // if (!usernameOrEmailAddress) {
+        //    alert('UserName Can Not Be Null');
+        //     return false;
+        // }
+
+        var password = document.getElementById('password').value;
+        var pwdMd5 = document.getElementById('pwdMd5').value;
+        console.log(pwdMd5);
+        if (!password && !pwdMd5) {
+            alert('PassWord And Md5 Can Not Be Null');
+            return false;
+        }
+
+        var xhr = new XMLHttpRequest();
+
+        xhr.onreadystatechange = function () {
+
+            if (xhr.readyState === XMLHttpRequest.DONE) {
+                // debugger;
+                if (xhr.status === 200) {
+                    // debugger;
+
+                    var resultdata = JSON.parse(xhr.responseText);
+                    if (resultdata.ErrorMessage != '') {
+                        alert(resultdata.ErrorMessage);
+                        return false;
+                    }
+                    if (resultdata.code == 300) {
+                        alert(resultdata.message);
+                    }
+                    else {
+                        var responseJSON = JSON.parse(xhr.responseText);
+                        var result = responseJSON;
+                        var expireDate = new Date(Date.now() + (60 * 60 * 24 * 1000));
+                        abp.auth.setToken(result.Result.JWTStr, expireDate);
+                        let selectDom = document.getElementById("roleSelect")
+                        selectDom.options.length = 0;
+                        result.Result.BasicInfo.AccountList.forEach(item => {
+                            selectDom.options.add(new Option(item.UserTypeShortName, item.Id));
+                        })
+                        // callback();
+                    }
+
+                } else {
+                    alert('Login failed !');
+                }
+            }
+        };
+
+        xhr.open('POST', '/User/getUserLoginRoleList', true);
+        xhr.setRequestHeader('Abp.TenantId', tenantId);
+        xhr.setRequestHeader('Content-type', 'application/json');
+        var parm = {
+
+
+            UserName: usernameOrEmailAddress,
+            Password: hex_md5(password),
+        }
+        if (pwdMd5 != '') {
+            parm.Password = pwdMd5;
+        }
+        xhr.send(JSON.stringify(parm));
+        //xhr.send("{" + "userName:'" + usernameOrEmailAddress + "'," + "passWord:'" + password + "'}");
+
+    };
+    function loginUserInternalRole(tenantId, callback) {
+
+        var usernameOrEmailAddress = document.getElementById('roleSelect').value;
+        //if (!usernameOrEmailAddress) {
+        //   alert('UserName Can Not Be Null');
+        //   return false;
+        //}
+
+        var password = document.getElementById('password').value;
+        var pwdMd5 = document.getElementById('pwdMd5').value;
+        console.log(pwdMd5);
+        if (!password && !pwdMd5) {
+            alert('PassWord And Md5 Can Not Be Null');
+            return false;
+        }
+
+        var xhr = new XMLHttpRequest();
+
+        xhr.onreadystatechange = function () {
+
+            if (xhr.readyState === XMLHttpRequest.DONE) {
+                // debugger;
+                if (xhr.status === 200) {
+                    // debugger;
+
+                    var resultdata = JSON.parse(xhr.responseText);
+                    if (resultdata.ErrorMessage != '') {
+                        alert(resultdata.ErrorMessage);
+                        return false;
+                    }
+                    if (resultdata.code == 300) {
+                        alert(resultdata.message);
+                    }
+                    else {
+                        var responseJSON = JSON.parse(xhr.responseText);
+                        var result = responseJSON;
+                        var expireDate = new Date(Date.now() + (60 * 60 * 24 * 1000));
+                        abp.auth.setToken(result.Result, expireDate);
+
+                        callback();
+                    }
+
+                } else {
+                    alert('Login failed !');
+                }
+            }
+        };
+
+        xhr.open('get', `/User/loginSelectUserRole?userRoleId=${usernameOrEmailAddress}`, true);
+        xhr.setRequestHeader('Abp.TenantId', tenantId);
+        xhr.setRequestHeader('Content-type', 'application/json');
+        var authToken = abp.auth.getToken();
+        xhr.setRequestHeader('Authorization', `Bearer ${authToken}`);
+        xhr.send();
+        //xhr.send("{" + "userName:'" + usernameOrEmailAddress + "'," + "passWord:'" + password + "'}");
+
+    };
+    abp.swagger.login = function (callback) {
+        //Get TenantId first
+        var tenancyName = document.getElementById('tenancyName').value;
+
+        if (tenancyName) {
+            var xhrTenancyName = new XMLHttpRequest();
+            xhrTenancyName.onreadystatechange = function () {
+                if (xhrTenancyName.readyState === XMLHttpRequest.DONE && xhrTenancyName.status === 200) {
+                    var responseJSON = JSON.parse(xhrTenancyName.responseText);
+                    var result = responseJSON.result;
+                    if (result.state === 1) { // Tenant exists and active.
+                        loginUserInternal(result.tenantId, callback); // Login for tenant    
+                    } else {
+                        alert('There is no such tenant or tenant is not active !');
+                    }
+                }
+            };
+
+            xhrTenancyName.open('POST', '/api/services/app/Account/IsTenantAvailable', true);
+            xhrTenancyName.setRequestHeader('Content-type', 'application/json');
+            xhrTenancyName.send("{" + "tenancyName:'" + tenancyName + "'}");
+        } else {
+            loginUserInternal(null, callback); // Login for host
+        }
+    };
+    abp.swagger.loginRole = function (callback) {
+        //Get TenantId first
+        var tenancyName = document.getElementById('tenancyName').value;
+
+        if (tenancyName) {
+            var xhrTenancyName = new XMLHttpRequest();
+            xhrTenancyName.onreadystatechange = function () {
+                if (xhrTenancyName.readyState === XMLHttpRequest.DONE && xhrTenancyName.status === 200) {
+                    var responseJSON = JSON.parse(xhrTenancyName.responseText);
+                    var result = responseJSON.result;
+                    if (result.state === 1) { // Tenant exists and active.
+                        loginUserInternalRole(result.tenantId, callback); // Login for tenant    
+                    } else {
+                        alert('There is no such tenant or tenant is not active !');
+                    }
+                }
+            };
+
+            xhrTenancyName.open('POST', '/api/services/app/Account/IsTenantAvailable', true);
+            xhrTenancyName.setRequestHeader('Content-type', 'application/json');
+            xhrTenancyName.send("{" + "tenancyName:'" + tenancyName + "'}");
+        } else {
+            loginUserInternalRole(null, callback); // Login for host
+        }
+    };
+
+    abp.swagger.logout = function () {
+        abp.auth.clearToken();
+    }
+
+    abp.swagger.closeAuthDialog = function () {
+        if (document.getElementById('abp-auth-dialog')) {
+            document.getElementsByClassName("swagger-ui")[1].removeChild(document.getElementById('abp-auth-dialog'));
+        }
+    }
+
+    abp.swagger.openAuthDialog = function (loginCallback) {
+        abp.swagger.closeAuthDialog();
+
+        var abpAuthDialog = document.createElement('div');
+        abpAuthDialog.className = 'dialog-ux';
+        abpAuthDialog.id = 'abp-auth-dialog';
+
+        document.getElementsByClassName("swagger-ui")[1].appendChild(abpAuthDialog);
+
+        // -- backdrop-ux
+        var backdropUx = document.createElement('div');
+        backdropUx.className = 'backdrop-ux';
+        abpAuthDialog.appendChild(backdropUx);
+
+        // -- modal-ux
+        var modalUx = document.createElement('div');
+        modalUx.className = 'modal-ux';
+        abpAuthDialog.appendChild(modalUx);
+
+        // -- -- modal-dialog-ux
+        var modalDialogUx = document.createElement('div');
+        modalDialogUx.className = 'modal-dialog-ux';
+        modalUx.appendChild(modalDialogUx);
+
+        // -- -- -- modal-ux-inner
+        var modalUxInner = document.createElement('div');
+        modalUxInner.className = 'modal-ux-inner';
+        modalDialogUx.appendChild(modalUxInner);
+
+        // -- -- -- -- modal-ux-header
+        var modalUxHeader = document.createElement('div');
+        modalUxHeader.className = 'modal-ux-header';
+        modalUxInner.appendChild(modalUxHeader);
+
+        var modalHeader = document.createElement('h3');
+        modalHeader.innerText = 'Authorize';
+        modalUxHeader.appendChild(modalHeader);
+
+        // -- -- -- -- modal-ux-content
+        var modalUxContent = document.createElement('div');
+        modalUxContent.className = 'modal-ux-content';
+        modalUxInner.appendChild(modalUxContent);
+
+        modalUxContent.onkeydown = function (e) {
+            if (e.keyCode === 13) {
+                //try to login when user presses enter on authorize modal
+                abp.swagger.login(loginCallback);
+            }
+        };
+
+        //Inputs
+        createInput(modalUxContent, 'tenancyName', 'Tenancy Name (Leave empty for Host)');
+        createInput(modalUxContent, 'userName', 'Username or email address', 'text', 'cyldev');
+        createInput(modalUxContent, 'password', 'Password', 'password', '123456');
+        createInput(modalUxContent, 'pwdMd5', 'PwdMd5', 'text', '');
+        createSelect(modalUxContent, 'roleSelect', 'role', [])
+
+        //Buttons
+        var authBtnWrapper = document.createElement('div');
+        authBtnWrapper.className = 'auth-btn-wrapper';
+        modalUxContent.appendChild(authBtnWrapper);
+
+        //Close button
+        var closeButton = document.createElement('button');
+        closeButton.className = 'btn modal-btn auth btn-done button';
+        closeButton.innerText = 'Close';
+        closeButton.style.marginRight = '5px';
+        closeButton.onclick = abp.swagger.closeAuthDialog;
+        authBtnWrapper.appendChild(closeButton);
+
+        //Authorize button
+        var authorizeButton = document.createElement('button');
+        authorizeButton.className = 'btn modal-btn auth authorize button';
+        authorizeButton.innerText = 'Login';
+        authorizeButton.onclick = function () {
+            abp.swagger.login(loginCallback);
+        };
+        authBtnWrapper.appendChild(authorizeButton);
+
+        // login role
+        var authorizeButton = document.createElement('button');
+        authorizeButton.className = 'btn modal-btn auth authorize button';
+        authorizeButton.innerText = 'LoginRole';
+        authorizeButton.onclick = function () {
+            abp.swagger.loginRole(loginCallback);
+        };
+        authBtnWrapper.appendChild(authorizeButton);
+    }
+
+    function createInput(container, id, title, type, value = "") {
+        var wrapper = document.createElement('div');
+        wrapper.className = 'wrapper';
+        if (id == "tenancyName") {
+            wrapper.style.display = 'none';
+        }
+        container.appendChild(wrapper);
+
+        var label = document.createElement('label');
+        label.innerText = title;
+        wrapper.appendChild(label);
+
+        var section = document.createElement('section');
+        section.className = 'block-tablet col-10-tablet block-desktop col-10-desktop';
+        wrapper.appendChild(section);
+
+        var input = document.createElement('input');
+        input.id = id;
+        input.type = type ? type : 'text';
+        input.style.width = '100%';
+        input.value = value;
+        input.autocomplete = "off";
+
+
+        section.appendChild(input);
+    }
+    function createSelect(container, id, title, option = []) {
+        var wrapper = document.createElement('div');
+        wrapper.className = 'wrapper';
+        if (id == "tenancyName") {
+            wrapper.style.display = 'none';
+        }
+        container.appendChild(wrapper);
+
+        var label = document.createElement('label');
+        label.innerText = title;
+        wrapper.appendChild(label);
+
+        var section = document.createElement('section');
+        section.className = 'block-tablet col-10-tablet block-desktop col-10-desktop';
+        wrapper.appendChild(section);
+
+        var input = document.createElement('select');
+        input.id = id;
+        input.style.width = '100%';
+        option.forEach(item => {
+            input.options.add(new Option(item.UserTypeShortName, item.Id));
+        })
+
+        section.appendChild(input);
+    }
+
+})();

IRaCIS.Core.API.sln

@@ -19,8 +19,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRaCIS.Core.Infrastructure"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRC.Core.SCP", "IRC.Core.SCP\IRC.Core.SCP.csproj", "{ECD08F47-DC1A-484E-BB91-6CDDC8823CC5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IRC.Core.Dicom", "IRC.Core.Dicom\IRC.Core.Dicom.csproj", "{0545F0A5-D97B-4A47-92A6-A8A02A181322}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -59,10 +57,6 @@ Global
 		{ECD08F47-DC1A-484E-BB91-6CDDC8823CC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ECD08F47-DC1A-484E-BB91-6CDDC8823CC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ECD08F47-DC1A-484E-BB91-6CDDC8823CC5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0545F0A5-D97B-4A47-92A6-A8A02A181322}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0545F0A5-D97B-4A47-92A6-A8A02A181322}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0545F0A5-D97B-4A47-92A6-A8A02A181322}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0545F0A5-D97B-4A47-92A6-A8A02A181322}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

IRaCIS.Core.API/Controllers/ExtraController.cs

@@ -1,7 +1,6 @@
 using AlibabaCloud.SDK.Sts20150401;
 using Amazon.Auth.AccessControlPolicy;
 using Amazon.SecurityToken;
-using AutoMapper;
 using Azure.Core;
 using IdentityModel.Client;
 using IdentityModel.OidcClient;
@@ -22,7 +21,6 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Org.BouncyCastle.Tls;
 using RestSharp;
 using RestSharp.Authenticators;
 using System;
@@ -104,11 +102,6 @@ namespace IRaCIS.Api.Controllers
         }
 
 
-
-
-
-
-
         [AllowAnonymous]
         [HttpGet, Route("user/getPublicKey")]
         public IResponseOutput GetPublicKey([FromServices] IOptionsMonitor<IRCEncreptOption> _IRCEncreptOption)
@@ -134,6 +127,7 @@ namespace IRaCIS.Api.Controllers
         }
 
         [HttpGet("user/GetObjectStoreToken")]
+        [AllowAnonymous]
         public async Task<IResponseOutput> GetObjectStoreTokenAsync([FromServices] IOptionsMonitor<ObjectStoreServiceOptions> options, [FromServices] IOSSService _oSSService)
         {
 
@@ -183,7 +177,6 @@ namespace IRaCIS.Api.Controllers
             return tempToken;
         }
 
-
         #region 老项目依赖
 
         [HttpGet("user/GenerateSTS")]
@@ -210,23 +203,7 @@ namespace IRaCIS.Api.Controllers
             var response = client.AssumeRoleWithOptions(assumeRoleRequest, runtime);
             var credentials = response.Body.Credentials;
 
-            var tempToken = new AliyunOSSTempToken()
-            {
-                AccessKeyId = credentials.AccessKeyId,
-                AccessKeySecret = credentials.AccessKeySecret,
 
-                //转为服务器时区，最后统一转为客户端时区
-                Expiration = TimeZoneInfo.ConvertTimeFromUtc(DateTime.Parse(credentials.Expiration), TimeZoneInfo.Local),
-                SecurityToken = credentials.SecurityToken,
-
-
-                Region = ossOptions.Region,
-                BucketName = ossOptions.BucketName,
-                EndPoint = ossOptions.EndPoint,
-                ViewEndpoint = ossOptions.ViewEndpoint,
-                PreviewEndpoint = ossOptions.PreviewEndpoint
-
-            };
 
             // 返回STS令牌信息给前端
             var stsToken = new

IRaCIS.Core.API/Controllers/FinancialChangeController.cs

@@ -51,30 +51,30 @@ namespace IRaCIS.Core.API.Controllers.Special
         [TrialGlobalLimit( "AddOrUpdateTrial", "BeforeOngoingCantOpt", "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput<Trial>> AddOrUpdateTrial(TrialCommand param)
         {
-            //var userId = Guid.Parse(User.FindFirst("id").Value);
+            var userId = Guid.Parse(User.FindFirst("id").Value);
             var result = await _trialService.AddOrUpdateTrial(param);
 
-            //if (_trialService.TrialExpeditedChange)
-            //{
-            //    var needCalReviewerIds = await _trialService.GetTrialEnrollmentReviewerIds(param.Id.Value);
-            //    var calcList = await _calculateService.GetNeedCalculateReviewerList(Guid.Empty, string.Empty);
+            if (_trialService.TrialExpeditedChange)
+            {
+                var needCalReviewerIds = await _trialService.GetTrialEnrollmentReviewerIds(param.Id.Value);
+                var calcList = await _calculateService.GetNeedCalculateReviewerList(Guid.Empty, string.Empty);
 
-            //    calcList.ForEach(t =>
-            //    {
-            //        if (needCalReviewerIds.Contains(t.DoctorId))
-            //        {
-            //            _calculateService.CalculateMonthlyPayment(new CalculateDoctorAndMonthDTO()
-            //            {
-            //                NeedCalculateReviewers = new List<Guid>()
-            //                {
-            //                    t.DoctorId
-            //                },
-            //                CalculateMonth = DateTime.Parse(t.YearMonth)
-            //            }, User.FindFirst("id").Value);
+                calcList.ForEach(t =>
+                {
+                    if (needCalReviewerIds.Contains(t.DoctorId))
+                    {
+                        _calculateService.CalculateMonthlyPayment(new CalculateDoctorAndMonthDTO()
+                        {
+                            NeedCalculateReviewers = new List<Guid>()
+                            {
+                                t.DoctorId
+                            },
+                            CalculateMonth = DateTime.Parse(t.YearMonth)
+                        }, User.FindFirst("id").Value);
 
-            //        }
-            //    });
-            //}
+                    }
+                });
+            }
 
             return result;
         }

IRaCIS.Core.API/Controllers/InspectionController.cs

@@ -2,7 +2,6 @@
 using IRaCIS.Application.Interfaces;
 using IRaCIS.Core.Application.BusinessFilter;
 using IRaCIS.Core.Application.Contracts;
-using IRaCIS.Core.Application.Contracts.DTO;
 using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.Image.QA;
 using IRaCIS.Core.Application.Service;
@@ -23,7 +22,6 @@ namespace IRaCIS.Core.API.Controllers
     [ApiController, ApiExplorerSettings(GroupName = "Reviewer")]
     [UnitOfWork]
     public class InspectionController(
-        ITrialDocumentService _trialDocumentService,
         IReadingImageTaskService _iReadingImageTaskService,
         ITrialConfigService _trialConfigService,
         IClinicalAnswerService _clinicalAnswerService,
@@ -35,31 +33,6 @@ namespace IRaCIS.Core.API.Controllers
         ) : ControllerBase
     {
 
-
-        [HttpPost, Route("Inspection/NoneDicomStudy/UpdateNoneDicomStudy")]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
-        [UnitOfWork]
-
-        public async Task<IResponseOutput> UpdateNoneDicomStudy(DataInspectionDto<NoneDicomEdit> opt, [FromServices] INoneDicomStudyService _noneDicomStudyService)
-        {
-            var singId = await _inspectionService.RecordSing(opt.SignInfo);
-            var result = await _noneDicomStudyService.UpdateNoneDicomStudy(opt.Data);
-            await _inspectionService.CompletedSign(singId, result);
-            return result;
-        }
-
-        [HttpPost, Route("Inspection/QCOperation/UpdateDicomStudyInfo")]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
-        [UnitOfWork]
-
-        public async Task<IResponseOutput> UpdateDicomStudyInfo(DataInspectionDto<DicomStudyEdit> opt, [FromServices] IQCOperationService _qcOperationService)
-        {
-            var singId = await _inspectionService.RecordSing(opt.SignInfo);
-            var result = await _qcOperationService.UpdateDicomStudyInfo(opt.Data);
-            await _inspectionService.CompletedSign(singId, result);
-            return result;
-        }
-
         #region 获取稽查数据
         /// <summary>
         /// 获取稽查数据
@@ -78,7 +51,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns> 
         [HttpPost, Route("Inspection/ReadingImageTask/SubmitOncologyReadingInfo")]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         [UnitOfWork]
         public async Task<IResponseOutput> SetOncologyReadingInfo(DataInspectionDto<SubmitOncologyReadingInfoInDto> opt)
@@ -95,7 +68,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns> 
         [HttpPost, Route("Inspection/ReadingImageTask/SubmitDicomVisitTask")]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         [UnitOfWork]
         public async Task<IResponseOutput> SubmitDicomVisitTask(DataInspectionDto<SubmitDicomVisitTaskInDto> opt)
@@ -114,7 +87,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns> 
         [HttpPost, Route("Inspection/ReadingImageTask/SubmitGlobalReadingInfo")]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         [UnitOfWork]
         public async Task<IResponseOutput> SubmitGlobalReadingInfo(DataInspectionDto<SubmitGlobalReadingInfoInDto> opt)
@@ -133,7 +106,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns> 
         [HttpPost, Route("Inspection/configTrialBasicInfo/TrialReadingInfoSign")]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         [UnitOfWork]
         public async Task<IResponseOutput> TrialReadingInfoSign(DataInspectionDto<TrialReadingInfoSignInDto> opt)
@@ -152,7 +125,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns>
         [HttpPost, Route("Inspection/ReadingMedicalReview/FinishMedicalReview")]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         [UnitOfWork]
         public async Task<IResponseOutput> FinishMedicalReview(DataInspectionDto<FinishMedicalReviewInDto> opt)
@@ -169,7 +142,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns>
         [HttpPost, Route("Inspection/ReadingMedicineQuestion/ConfirmReadingMedicineQuestion")]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         [UnitOfWork]
         public async Task<IResponseOutput> ConfirmReadingMedicineQuestion(DataInspectionDto<ConfirmReadingMedicineQuestionInDto> opt)
@@ -187,7 +160,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns>
         [HttpPost, Route("Inspection/ReadingImageTask/SubmitVisitTaskQuestions")]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         [UnitOfWork]
         public async Task<IResponseOutput> SubmitVisitTaskQuestions(DataInspectionDto<SubmitVisitTaskQuestionsInDto> opt)
@@ -205,7 +178,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns>
         [HttpPost, Route("Inspection/ClinicalAnswer/CRCSignClinicalData")]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         [UnitOfWork]
         public async Task<IResponseOutput> CRCSignClinicalData(DataInspectionDto<CRCSignClinicalDataInDto> opt)
@@ -223,7 +196,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns>
         [HttpPost, Route("Inspection/ClinicalAnswer/CRCConfirmClinical")]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         [UnitOfWork]
         public async Task<IResponseOutput> CRCConfirmClinical(DataInspectionDto<CRCConfirmClinicalInDto> opt)
@@ -240,7 +213,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns>
         [HttpPost, Route("Inspection/ClinicalAnswer/CRCCancelConfirmClinical")]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         [UnitOfWork]
         public async Task<IResponseOutput> CRCCancelConfirmClinical(DataInspectionDto<CRCCancelConfirmClinicalInDto> opt)
@@ -258,7 +231,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns>
         [HttpPost, Route("Inspection/ClinicalAnswer/PMConfirmClinical")]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         [UnitOfWork]
         public async Task<IResponseOutput> PMConfirmClinical(DataInspectionDto<CRCConfirmClinicalInDto> opt)
@@ -276,7 +249,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns>
         [HttpPost, Route("Inspection/ReadingClinicalData/SignConsistencyAnalysisReadingClinicalData")]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         [UnitOfWork]
         public async Task<IResponseOutput> SignConsistencyAnalysisReadingClinicalData(DataInspectionDto<SignConsistencyAnalysisReadingClinicalDataInDto> opt)
@@ -293,7 +266,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns>
         [HttpPost, Route("Inspection/ClinicalAnswer/SubmitClinicalFormAndSign")]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         [UnitOfWork]
         public async Task<IResponseOutput> SubmitClinicalFormAndSign(DataInspectionDto<SubmitClinicalFormInDto> opt)
@@ -310,7 +283,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns>
         [HttpPost, Route("Inspection/ReadingImageTask/SubmitJudgeVisitTaskResult")]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         [UnitOfWork]
         public async Task<IResponseOutput> SubmitJudgeVisitTaskResult(DataInspectionDto<SaveJudgeVisitTaskResult> opt)
@@ -329,7 +302,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <returns></returns> 
         [HttpPost, Route("Inspection/configTrialBasicInfo/ConfigTrialBasicInfoConfirm")]
         [UnitOfWork]
-        [TrialGlobalLimit("BeforeOngoingCantOpt")]
+        [TrialGlobalLimit( "BeforeOngoingCantOpt" )]
         public async Task<IResponseOutput> ConfigTrialBasicInfoConfirm(DataInspectionDto<BasicTrialConfig> opt)
         {
 
@@ -371,7 +344,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <returns></returns> 
         [HttpPost, Route("Inspection/configTrialBasicInfo/ConfigTrialUrgentInfoConfirm")]
         [UnitOfWork]
-        [TrialGlobalLimit("BeforeOngoingCantOpt")]
+        [TrialGlobalLimit( "BeforeOngoingCantOpt" )]
         public async Task<IResponseOutput> ConfigTrialUrgentInfoConfirm(DataInspectionDto<TrialUrgentConfig> opt)
         {
             opt.Data.IsTrialUrgentConfirmed = true;
@@ -384,7 +357,7 @@ namespace IRaCIS.Core.API.Controllers
 
         [HttpPost, Route("Inspection/configTrialBasicInfo/ConfigTrialPACSInfoConfirm")]
         [UnitOfWork]
-        [TrialGlobalLimit("BeforeOngoingCantOpt")]
+        [TrialGlobalLimit( "BeforeOngoingCantOpt" )]
         public async Task<IResponseOutput> ConfigTrialPACSInfoConfirm(DataInspectionDto<TrialPACSConfig> opt)
         {
             opt.Data.IsTrialPACSConfirmed = true;
@@ -400,7 +373,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <returns></returns>
         [HttpPost, Route("Inspection/configTrialBasicInfo/TrialConfigSignatureConfirm")]
         [UnitOfWork]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         public async Task<IResponseOutput> TrialConfigSignatureConfirm(DataInspectionDto<SignConfirmDTO> opt)
         {
@@ -417,7 +390,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <returns></returns>
         [HttpPost, Route("Inspection/ReadingCriterion/ResetAndAsyncCriterion")]
         [UnitOfWork]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         public async Task<IResponseOutput> ResetAndAsyncCriterion(DataInspectionDto<ResetAndAsyncCriterionInDto> opt)
         {
@@ -435,7 +408,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns>
         [HttpPost, Route("Inspection/QCOperation/CRCRequestToQC")]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         [UnitOfWork]
         public async Task<IResponseOutput> CRCRequestToQC(DataInspectionDto<CRCRequestToQCCommand> opt)
         {
@@ -450,31 +423,21 @@ namespace IRaCIS.Core.API.Controllers
         /// 设置QC 通过或者不通过   7:QC failed  8：QC passed  
         /// </summary>
         [HttpPost, Route("Inspection/QCOperation/QCPassedOrFailed")]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         [UnitOfWork]
         public async Task<IResponseOutput> QCPassedOrFailed(DataInspectionDto<QCPassedOrFailedDto> opt)
         {
             var singid = await _inspectionService.RecordSing(opt.SignInfo);
-            if (opt.Data.IsSecondPass != null)
-            {
-                var result = await _qCOperationService.QCSecondReviewPassedOrFailed(opt.Data.trialId, opt.Data.subjectVisitId, (bool)opt.Data.IsSecondPass);
-                await _inspectionService.CompletedSign(singid, result);
-                return result;
-            }
-            else
-            {
-                var result = await _qCOperationService.QCPassedOrFailed(opt.Data.trialId, opt.Data.subjectVisitId, opt.Data.auditState);
-                await _inspectionService.CompletedSign(singid, result);
-                return result;
-            }
-
+            var result = await _qCOperationService.QCPassedOrFailed(opt.Data.trialId, opt.Data.subjectVisitId, opt.Data.auditState);
+            await _inspectionService.CompletedSign(singid, result);
+            return result;
         }
 
         /// <summary>
         /// 一致性核查 回退  对话记录不清除  只允许PM回退
         /// </summary>
         [HttpPost, Route("Inspection/QCOperation/CheckBack")]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         [UnitOfWork]
         public async Task<IResponseOutput> CheckBack(DataInspectionDto<IDDto> opt)
         {
@@ -491,7 +454,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns>
         [HttpPost, Route("Inspection/ReadClinicalData/ReadClinicalDataSign")]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         [UnitOfWork]
         public async Task<IResponseOutput> ReadClinicalDataSign(DataInspectionDto<ReadingClinicalDataSignIndto> opt)
         {
@@ -506,7 +469,7 @@ namespace IRaCIS.Core.API.Controllers
         /// CRC  设置已经重传完成
         /// </summary>
         [HttpPost, Route("Inspection/QCOperation/SetReuploadFinished")]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         [UnitOfWork]
         public async Task<IResponseOutput> SetReuploadFinished(DataInspectionDto<CRCReuploadFinishedCommand> opt)
         {
@@ -522,7 +485,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns>
         [HttpPost, Route("Inspection/TrialConfig/updateTrialState")]
-        [TrialGlobalLimit("BeforeOngoingCantOpt")]
+        [TrialGlobalLimit( "BeforeOngoingCantOpt")]
         [UnitOfWork]
         public async Task<IResponseOutput> UpdateTrialState(DataInspectionDto<UpdateTrialStateDto> opt)
         {
@@ -533,21 +496,7 @@ namespace IRaCIS.Core.API.Controllers
         }
 
 
-        /// <summary>
-        /// 用户 签名某个文档  
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost, Route("Inspection/TrialDocument/userConfirm")]
-        [TrialGlobalLimit("BeforeOngoingCantOpt", "SignSystemDocNoTrialId", "AfterStopCannNotOpt")]
-        [UnitOfWork]
-        public async Task<IResponseOutput> UserConfirm(DataInspectionDto<UserConfirmCommand> opt)
-        {
-            var singid = await _inspectionService.RecordSing(opt.SignInfo);
-            opt.Data.SignText = opt.SignInfo.SignText;
-            var result = await _trialDocumentService.UserConfirm(opt.Data);
-            await _inspectionService.CompletedSign(singid, result);
-            return result;
-        }
+
 
 
         /// <summary>
@@ -555,13 +504,13 @@ namespace IRaCIS.Core.API.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpPost, Route("Inspection/VisitTask/ConfirmReReading")]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         [UnitOfWork]
 
-        public async Task<IResponseOutput> ConfirmReReading(DataInspectionDto<ConfirmReReadingCommand> opt, [FromServices] IVisitTaskService _visitTaskService)
+        public async Task<IResponseOutput> ConfirmReReading(DataInspectionDto<ConfirmReReadingCommand> opt, [FromServices] IVisitTaskHelpeService _visitTaskCommonService, [FromServices] IVisitTaskService _visitTaskService)
         {
             var singId = await _inspectionService.RecordSing(opt.SignInfo);
-            var result = await _visitTaskService.ConfirmReReading(opt.Data);
+            var result = await _visitTaskService.ConfirmReReading(opt.Data, _visitTaskCommonService);
             await _inspectionService.CompletedSign(singId, result);
             return result;
         }

IRaCIS.Core.API/HostService/DicomSCPService.cs

@@ -0,0 +1,363 @@
+using AutoMapper.Execution;
+using DocumentFormat.OpenXml.Bibliography;
+using FellowOakDicom;
+using FellowOakDicom.Network;
+using FellowOakDicom.Network.Client;
+using IRaCIS.Core.Application.Contracts;
+using IRaCIS.Core.Domain.Models;
+using IRaCIS.Core.Infra.EFCore;
+using IRaCIS.Core.Infrastructure.Extention;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Org.BouncyCastle.Bcpg;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.API.HostService
+{
+
+    public class DicomSCPService : DicomService, IDicomServiceProvider, IDicomCFindProvider, IDicomCEchoProvider, IDicomCMoveProvider
+    {
+
+        private static readonly DicomTransferSyntax[] _acceptedTransferSyntaxes = new DicomTransferSyntax[]
+           {
+                DicomTransferSyntax.ExplicitVRLittleEndian,
+                DicomTransferSyntax.ExplicitVRBigEndian,
+                DicomTransferSyntax.ImplicitVRLittleEndian
+           };
+
+
+        private static readonly DicomTransferSyntax[] _acceptedImageTransferSyntaxes = new DicomTransferSyntax[]
+            {
+                // Lossless
+                DicomTransferSyntax.JPEGLSLossless,
+                DicomTransferSyntax.JPEG2000Lossless,
+                DicomTransferSyntax.JPEGProcess14SV1,
+                DicomTransferSyntax.JPEGProcess14,
+                DicomTransferSyntax.RLELossless,
+
+                // Lossy
+                DicomTransferSyntax.JPEGLSNearLossless,
+                DicomTransferSyntax.JPEG2000Lossy,
+                DicomTransferSyntax.JPEGProcess1,
+                DicomTransferSyntax.JPEGProcess2_4,
+
+                // Uncompressed
+                DicomTransferSyntax.ExplicitVRLittleEndian,
+                DicomTransferSyntax.ExplicitVRBigEndian,
+                DicomTransferSyntax.ImplicitVRLittleEndian
+            };
+
+
+
+        private IServiceProvider _serviceProvider { get; set; }
+
+        private DicomSCPServiceOption DicomSCPServiceConfig { get; set; }
+
+
+        public string CallingAE { get; protected set; }
+        public string CalledAE { get; protected set; }
+
+        public DicomSCPService(INetworkStream stream, Encoding fallbackEncoding, Microsoft.Extensions.Logging.ILogger log, DicomServiceDependencies dependencies, IServiceProvider injectServiceProvider)
+    : base(stream, fallbackEncoding, log, dependencies)
+        {
+            _serviceProvider = injectServiceProvider.CreateScope().ServiceProvider;
+        }
+
+
+
+        public void OnConnectionClosed(Exception exception)
+        {
+            if (exception != null)
+            {
+                Logger.LogError($"Closed, exception is {exception.Message}");
+            }
+        }
+
+        public void OnReceiveAbort(DicomAbortSource source, DicomAbortReason reason)
+        {
+            Logger.LogError($"Received abort from {source}, reason is {reason}");
+        }
+
+        public Task OnReceiveAssociationReleaseRequestAsync()
+        {
+            return SendAssociationReleaseResponseAsync();
+        }
+
+        public Task OnReceiveAssociationRequestAsync(DicomAssociation association)
+        {
+            CallingAE = association.CallingAE;
+            CalledAE = association.CalledAE;
+
+            Logger.LogInformation($"Received association request from AE: {CallingAE} with IP: {association.RemoteHost} ");
+
+            DicomSCPServiceConfig = _serviceProvider.GetService<IOptionsMonitor<DicomSCPServiceOption>>().CurrentValue;
+            var calledAEList = DicomSCPServiceConfig.CalledAEList;
+
+            //不支持三方服务  或者CallAE不对，那么拒绝连接
+            if (!calledAEList.Contains(CalledAE) || DicomSCPServiceConfig.IsSupportThirdService == false || CallingAE != DicomSCPServiceConfig.ThirdCallningAE)
+            {
+                Logger.LogError($"Association with {CallingAE} rejected since called aet {CalledAE} is unknown");
+                return SendAssociationRejectAsync(DicomRejectResult.Permanent, DicomRejectSource.ServiceUser, DicomRejectReason.CalledAENotRecognized);
+            }
+
+            foreach (var pc in association.PresentationContexts)
+            {
+                if (pc.AbstractSyntax == DicomUID.Verification
+                    || pc.AbstractSyntax == DicomUID.PatientRootQueryRetrieveInformationModelFind
+                    || pc.AbstractSyntax == DicomUID.PatientRootQueryRetrieveInformationModelMove
+                    || pc.AbstractSyntax == DicomUID.StudyRootQueryRetrieveInformationModelFind
+                    || pc.AbstractSyntax == DicomUID.StudyRootQueryRetrieveInformationModelMove)
+                {
+                    pc.AcceptTransferSyntaxes(_acceptedTransferSyntaxes);
+                }
+                else if (pc.AbstractSyntax == DicomUID.PatientRootQueryRetrieveInformationModelGet
+                    || pc.AbstractSyntax == DicomUID.StudyRootQueryRetrieveInformationModelGet)
+                {
+                    pc.AcceptTransferSyntaxes(_acceptedImageTransferSyntaxes);
+                }
+                else if (pc.AbstractSyntax.StorageCategory != DicomStorageCategory.None)
+                {
+                    pc.AcceptTransferSyntaxes(_acceptedImageTransferSyntaxes);
+                }
+                else
+                {
+                    Logger.LogWarning($"Requested abstract syntax {pc.AbstractSyntax} from {CallingAE} not supported");
+                    pc.SetResult(DicomPresentationContextResult.RejectAbstractSyntaxNotSupported);
+                }
+            }
+
+            Logger.LogInformation($"Accepted association request from {CallingAE}");
+            return SendAssociationAcceptAsync(association);
+        }
+
+        public Task<DicomCEchoResponse> OnCEchoRequestAsync(DicomCEchoRequest request)
+        {
+            Logger.LogInformation("Received verification request from AE {0} with IP: {1}", CallingAE, Association.RemoteHost);
+            return Task.FromResult(new DicomCEchoResponse(request, DicomStatus.Success));
+        }
+        public async IAsyncEnumerable<DicomCFindResponse> OnCFindRequestAsync(DicomCFindRequest request)
+        {
+            Console.WriteLine("Received C-FIND request, forwarding to real PACS...");
+
+            var cts = new CancellationTokenSource();
+
+            var _dicomAERepository = _serviceProvider.GetService<IRepository<DicomAE>>();
+
+            var find = await _dicomAERepository.FirstOrDefaultAsync(t => t.PacsTypeEnum == PacsType.PacsServer && t.CalledAE == DicomSCPServiceConfig.ThirdSearchPacsAE);
+
+            var hirClient = await _dicomAERepository.FirstOrDefaultAsync(t => t.PacsTypeEnum == PacsType.HIRClient);
+
+
+            if (find == null || hirClient == null)
+            {
+                Logger.LogInformation("客户端和Pacs配置未查询到");
+
+                yield return new DicomCFindResponse(request, DicomStatus.ProcessingFailure);
+                yield break;
+            }
+
+            string patientID = request.Dataset.GetSingleValueOrDefault(DicomTag.PatientID, string.Empty);
+            string patientName = request.Dataset.GetSingleValueOrDefault(DicomTag.PatientName, string.Empty);
+            string studyDate = request.Dataset.GetSingleValueOrDefault(DicomTag.StudyDate, string.Empty);
+            string studyInstanceUID = request.Dataset.GetSingleValueOrDefault(DicomTag.StudyInstanceUID, string.Empty);
+            string accessionNumber = request.Dataset.GetSingleValueOrDefault(DicomTag.AccessionNumber, string.Empty);
+
+
+            if (patientID.IsNullOrEmpty() && patientName.IsNullOrEmpty() && studyInstanceUID.IsNullOrEmpty() && studyDate.IsNullOrEmpty() && accessionNumber.IsNullOrEmpty())
+            {
+                yield return new DicomCFindResponse(request, DicomStatus.MissingAttribute);
+                yield break;
+            }
+
+
+            // 创建 channel 用于异步传递响应
+            var channel = Channel.CreateUnbounded<DicomCFindResponse>();
+
+            // 克隆 dataset 避免线程/状态冲突
+            var clonedDataset = request.Dataset?.Clone() ?? new DicomDataset();
+            var forward = new DicomCFindRequest(request.SOPClassUID, request.Level)
+            {
+                Dataset = clonedDataset
+            };
+
+            var receivedCount = 0;
+
+            // 标记是否已收到 final 状态（Success/Failure/Cancel）
+            var finalReceived = false;
+
+            // 当远端 PACS 返回响应时，异步写入 channel
+            forward.OnResponseReceived += (rq, rp) =>
+            {
+
+                #region 取消，现在不行
+
+                ////100条的时候直接取消
+                //if (receivedCount >= 10)
+                //{
+                //    rp.Status = DicomStatus.Cancel;
+
+                //    cts.Cancel(); // 触发取消
+
+                //    Logger.LogWarning("超过100条，剩余的取消!");
+                //}
+
+                //receivedCount++;
+
+                #endregion
+
+
+                var dsCopy = rp.Dataset?.Clone();
+                var proxyResp = new DicomCFindResponse(request, rp.Status)
+                {
+                    Dataset = dsCopy
+                };
+                channel.Writer.TryWrite(proxyResp);
+
+                if (!rp.Status.Equals(DicomStatus.Pending))
+                {
+                    finalReceived = true;
+                }
+            };
+
+
+            // 异步发送到真实 PACS
+            _ = Task.Run(async () =>
+            {
+                try
+                {
+                    var client = DicomClientFactory.Create(find.IP, find.Port, false, hirClient.CalledAE, find.CalledAE);
+                    await client.AddRequestAsync(forward);
+                    await client.SendAsync(cancellationToken: cts.Token);
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine("Error forwarding C-FIND: " + ex.Message);
+                }
+                finally
+                {
+                    channel.Writer.Complete();
+                }
+            });
+
+            // 异步 yield 返回给上游
+            await foreach (var resp in channel.Reader.ReadAllAsync())
+            {
+                yield return resp;
+            }
+
+            // 兜底：如果没有 final 响应，返回 Success
+            if (!finalReceived)
+            {
+                yield return new DicomCFindResponse(request, DicomStatus.Success);
+            }
+
+        }
+
+
+        public async IAsyncEnumerable<DicomCMoveResponse> OnCMoveRequestAsync(DicomCMoveRequest request)
+        {
+            Console.WriteLine("Received C-Move request, forwarding to real PACS...");
+
+            var _dicomAERepository = _serviceProvider.GetService<IRepository<DicomAE>>();
+            var _cmoveStudyRepository = _serviceProvider.GetService<IRepository<CmoveStudy>>();
+
+            var find = await _dicomAERepository.FirstOrDefaultAsync(t => t.PacsTypeEnum == PacsType.PacsServer && t.CalledAE == DicomSCPServiceConfig.ThirdSearchPacsAE);
+
+
+            var hirServer = await _dicomAERepository.FirstOrDefaultAsync(t => t.PacsTypeEnum == PacsType.HIRServer);
+
+            var hirClient = await _dicomAERepository.FirstOrDefaultAsync(t => t.PacsTypeEnum == PacsType.HIRClient);
+
+
+            if (find == null || hirClient == null || hirServer == null)
+            {
+                Logger.LogInformation("客户端和Pacs配置未查询到");
+            }
+
+            var studyInstanceUid = request.Dataset?.GetSingleValueOrDefault(DicomTag.StudyInstanceUID, string.Empty);
+
+            if (studyInstanceUid.IsNotNullOrEmpty())
+            {
+                await _cmoveStudyRepository.AddAsync(new CmoveStudy() { CallingAE = CallingAE, CalledAE = CalledAE, DestinationAE = request.DestinationAE, StudyInstanceUIDList = new List<string>() { studyInstanceUid }, HopitalGroupIdList = new List<Guid>() }, true);
+
+            }
+
+
+            var channel = Channel.CreateUnbounded<DicomCMoveResponse>();
+            var clonedDataset = request.Dataset?.Clone() ?? new DicomDataset();
+
+            var forward = new DicomCMoveRequest(hirServer.CalledAE, studyInstanceUid)
+            {
+                Dataset = clonedDataset
+            };
+
+            bool finalReceived = false;
+
+            // PACS 返回响应时写入 channel
+            forward.OnResponseReceived += (rq, rp) =>
+            {
+                var dsCopy = rp.Dataset?.Clone();
+                var proxyResp = new DicomCMoveResponse(request, rp.Status)
+                {
+                    Dataset = dsCopy,
+                    Remaining = rp.Remaining,
+                    Completed = rp.Completed,
+                    Failures = rp.Failures,
+                    Warnings = rp.Warnings,
+
+                };
+
+
+                Logger.LogInformation($"Completed:{rp.Completed}");
+
+
+                channel.Writer.TryWrite(proxyResp);
+
+                if (!rp.Status.Equals(DicomStatus.Pending))
+                {
+                    finalReceived = true;
+                }
+
+
+            };
+
+            // 异步发送到真实 PACS         
+            _ = Task.Run(async () =>
+            {
+                try
+                {
+                    var client = DicomClientFactory.Create(find.IP, find.Port, false, hirClient.CalledAE, find.CalledAE);
+                    await client.AddRequestAsync(forward);
+                    await client.SendAsync();
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine("Error forwarding C-MOVE: " + ex.Message);
+                }
+                finally
+                {
+                    channel.Writer.Complete();
+                }
+            });
+
+            // 异步 yield 回上游
+            await foreach (var resp in channel.Reader.ReadAllAsync())
+            {
+                yield return resp;
+            }
+
+            // 兜底
+            if (!finalReceived)
+            {
+                yield return new DicomCMoveResponse(request, DicomStatus.Success);
+            }
+        }
+    }
+}

IRaCIS.Core.API/HostService/HangfireHostService.cs

@@ -20,8 +20,6 @@ namespace IRaCIS.Core.API.HostService;
 
 public class HangfireHostService(IRecurringMessageScheduler _recurringMessageScheduler, 
     IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigRepository,
-
-     IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
     IMediator _mediator,
     ILogger<HangfireHostService> _logger) : IHostedService
 {
@@ -41,21 +39,6 @@ public class HangfireHostService(IRecurringMessageScheduler _recurringMessageSch
             HangfireJobHelper.RemoveCronJob(jobId);
         }
 
-        // 清除所有可能存在的定时任务，防止类型加载错误
-        var allJobIdList = JobStorage.Current.GetConnection().GetRecurringJobs().Select(t => t.Id).ToList();
-        foreach (var jobId in allJobIdList)
-        {
-            try
-            {
-                HangfireJobHelper.RemoveCronJob(jobId);
-                _logger.LogInformation($"已清除定时任务: {jobId}");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning($"清除定时任务 {jobId} 时出错: {ex.Message}");
-            }
-        }
-
 
         var taskInfoList = await _trialEmailNoticeConfigRepository.Where(t => t.Trial.TrialStatusStr == StaticData.TrialState.TrialOngoing && t.EmailCron != string.Empty && t.IsAutoSend)
               .Select(t => new { t.Id, t.Code, TrialCode = t.Trial.TrialCode, t.EmailCron, t.BusinessScenarioEnum, t.TrialId })
@@ -72,20 +55,6 @@ public class HangfireHostService(IRecurringMessageScheduler _recurringMessageSch
         }
 
 
-        // 系统邮件定时任务
-        var systemTaskInfoList = await _emailNoticeConfigrepository.Where(t => t.EmailCron != string.Empty && t.IsAutoSend)
-          .Select(t => new { t.Id, t.Code,  t.EmailCron, t.BusinessScenarioEnum, })
-          .ToListAsync();
-
-        foreach (var task in systemTaskInfoList)
-        {
-            //利用主键作为任务Id
-            var jobId = $"{task.Id}_({task.BusinessScenarioEnum})";
-
-            HangfireJobHelper.AddOrUpdateTimingCronJob(jobId, task.BusinessScenarioEnum, task.EmailCron);
-        }
-
-
         //await _recurringMessageScheduler.ScheduleRecurringPublish(new QCImageQuestionSchedule() { CronExpression = "0/3 * * * * ? " }, new MasstransiTestCommand { value = "message at " + DateTime.Now.ToString() });
 
 

IRaCIS.Core.API/IRaCIS.Core.API.csproj

@@ -69,9 +69,9 @@
 
 	<ItemGroup>
 		<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.14" />
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.19" />
 
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.15">
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.10">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
@@ -82,9 +82,9 @@
 		<PackageReference Include="Hangfire.SqlServer" Version="1.8.20" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" />
 		<PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />
-		<PackageReference Include="Serilog.Sinks.Email" Version="4.1.0" />
-		<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
-		<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="9.0.1" />
+		<PackageReference Include="Serilog.Sinks.Email" Version="4.0.0" />
+		<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
+		<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="9.0.3" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -110,6 +110,54 @@
 	  <Content Update="Resources\zh-CN.json">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
+	  <Content Update="wwwroot\ReadReoprtTemplate\downLoad\file.txt">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="wwwroot\ReadReoprtTemplate\ReportTemplate_IRECIST_CN_V1.docx">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="wwwroot\ReadReoprtTemplate\ReportTemplate_PCWG3_CN_V1.docx">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="wwwroot\ReadReoprtTemplate\ReportTemplate_RECIST1.1_CN_V1.docx">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="wwwroot\ReadReoprtTemplate\TumorEvaluation_IRECIST1.1_CN_V1.docx">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="wwwroot\ReadReoprtTemplate\TumorEvaluation_IRECIST1.1_EN_V1.docx">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="wwwroot\ReadReoprtTemplate\TumorEvaluation_RECIST1.1_CN_V1.docx">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="wwwroot\ReadReoprtTemplate\医院模板\协和\ReportTemplate_IRECIST_CN_V1.docx">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="wwwroot\ReadReoprtTemplate\医院模板\协和\ReportTemplate_PCWG3_CN_V1.docx">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="wwwroot\ReadReoprtTemplate\医院模板\协和\ReportTemplate_RECIST1.1_CN_V1.docx">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="wwwroot\ReadReoprtTemplate\医院模板\同济\ReportTemplate_IRECIST_CN_V1.docx">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="wwwroot\ReadReoprtTemplate\医院模板\同济\ReportTemplate_PCWG3_CN_V1.docx">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="wwwroot\ReadReoprtTemplate\医院模板\同济\ReportTemplate_RECIST1.1_CN_V1.docx">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="wwwroot\ReadReoprtTemplate\医院模板\复旦大学肿瘤附属医院\ReportTemplate_IRECIST_CN_V1.docx">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="wwwroot\ReadReoprtTemplate\医院模板\复旦大学肿瘤附属医院\ReportTemplate_PCWG3_CN_V1.docx">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="wwwroot\ReadReoprtTemplate\医院模板\复旦大学肿瘤附属医院\ReportTemplate_RECIST1.1_CN_V1.docx">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
 	</ItemGroup>
 
 	<ItemGroup>

IRaCIS.Core.API/IRaCIS.Core.API.xml

@@ -275,13 +275,7 @@
             <param name="opt"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.UserConfirm(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Contracts.UserConfirmCommand})">
-            <summary>
-            用户 签名某个文档  
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.ConfirmReReading(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.ViewModel.ConfirmReReadingCommand},IRaCIS.Core.Application.Service.IVisitTaskService)">
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.ConfirmReReading(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.ViewModel.ConfirmReReadingCommand},IRaCIS.Core.Application.Service.IVisitTaskHelpeService,IRaCIS.Core.Application.Service.IVisitTaskService)">
             <summary>
             重阅同意
             </summary>
@@ -343,6 +337,16 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.API.Controllers.UploadDownLoadController.DownloadReadingReportAndImage(IRaCIS.Core.Application.Contracts.IReadingImageTaskService,IRaCIS.Core.Application.Helper.IOSSService,Microsoft.AspNetCore.SignalR.IHubContext{IRaCIS.Core.API.DownloadHub,IRaCIS.Core.API.IDownloadClient},IRaCIS.Core.Application.Service.Reading.Dto.GetReadingReportAndImageInDto)">
+            <summary>
+            下载阅片报告和图片
+            </summary>
+            <param name="_readingImageTaskService"></param>
+            <param name="_oSSService"></param>
+            <param name="_downLoadHub"></param>
+            <param name="inCommand"></param>
+            <returns></returns>
+        </member>
         <member name="T:IRaCIS.Core.API.IpPolicyRateLimitSetup">
             <summary>
             IPLimit限流 启动服务

IRaCIS.Core.API/Progranm.cs

@@ -1,4 +1,6 @@
-using IRaCIS.Core.API;
+using FellowOakDicom.Network;
+using FellowOakDicom;
+using IRaCIS.Core.API;
 using IRaCIS.Core.API.HostService;
 using IRaCIS.Core.Application.BusinessFilter;
 using IRaCIS.Core.Application.Filter;
@@ -24,6 +26,9 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Runtime.InteropServices;
+using FellowOakDicom.Imaging.NativeCodec;
+using FellowOakDicom.Imaging;
+using IRaCIS.Core.Application.Contracts;
 
 AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
 AppContext.SetSwitch("Npgsql.DisableDateTimeInfinityConversions", true);
@@ -36,11 +41,6 @@ var config = new ConfigurationBuilder()
 
 var enviromentName = config["ASPNETCORE_ENVIRONMENT"];
 
-var openSwaggerStr = config["ASPNETCORE_OpenSwagger"];
-
-var isOpenSwagger= openSwaggerStr == null|| openSwaggerStr?.ToLower()=="true";
-
-
 if (string.IsNullOrWhiteSpace(enviromentName))
 {
 
@@ -104,6 +104,8 @@ builder.Services.AddControllers(options =>
 })
     .AddNewtonsoftJsonSetup(builder.Services); // NewtonsoftJson 序列化  处理
 
+builder.Services.AddOptions().Configure<DicomSCPServiceOption>(_configuration.GetSection("DicomSCPServiceConfig"));
+
 // Panda动态WebApi + UnifiedApiResultFilter + 省掉控制器代码
 builder.Services.AddDynamicWebApiSetup();
 //MinimalAPI
@@ -115,13 +117,8 @@ builder.Services.AddAutoMapperSetup();
 builder.Services.AddEFSetup(_configuration, enviromentName);
 //Http 响应压缩
 builder.Services.AddResponseCompressionSetup();
-
-if (isOpenSwagger)
-{
-    //Swagger Api 文档
-    builder.Services.AddSwaggerSetup();
-}
-
+//Swagger Api 文档
+builder.Services.AddSwaggerSetup();
 //JWT Token 验证
 builder.Services.AddJWTAuthSetup(_configuration);
 
@@ -134,11 +131,17 @@ builder.Services.AddFusionCache();
 // hangfire  定时任务框架  有界面，更友好~
 builder.Services.AddhangfireSetup(_configuration);
 
-//Serilog 日志可视化 LogDashboard日志
-//builder.Services.AddLogDashboardSetup();
 
 //Dicom影像渲染图片  跨平台
-builder.Services.AddDicomSetup();
+
+builder.Services.AddFellowOakDicom().AddTranscoderManager<NativeTranscoderManager>()
+              //.AddTranscoderManager<FellowOakDicom.Imaging.NativeCodec.NativeTranscoderManager>()
+              .AddImageManager<ImageSharpImageManager>();
+//builder.Services.AddDicomSetup();
+
+new DicomSetupBuilder()
+       .SkipValidation()
+       .Build();
 
 // 实时应用
 builder.Services.AddSignalR();
@@ -153,6 +156,7 @@ builder.Services.AddSignalR();
 
 //builder.Services.AddAntiforgery();
 
+
 #endregion
 
 var app = builder.Build();
@@ -219,19 +223,12 @@ app.UseResponseCompression();
 //不需要 token 访问的静态文件  wwwroot css, JavaScript, and images don't require authentication.
 app.UseStaticFiles();
 
-//LogDashboard
-//app.UseLogDashboard("/LogDashboard");
 
 //hangfire
 app.UseHangfireConfig(env);
 
 // Swagger
-
-if (isOpenSwagger)
-{
-    SwaggerSetup.Configure(app, env);
-}
-
+SwaggerSetup.Configure(app, env);
 
 //serilog 记录请求的用户信息
 app.UseSerilogConfig(env);
@@ -250,6 +247,7 @@ app.MapMasaMinimalAPIs();
 app.MapControllers();
 
 app.MapHub<UploadHub>("/UploadHub");
+app.MapHub<DownloadHub>("/DownloadHub");
 app.MapHealthChecks("/health");
 
 
@@ -291,6 +289,13 @@ try
     //Log.Logger.Warning($"ContentRootPath——xx：{Path.GetDirectoryName(Path.GetDirectoryName(env.ContentRootPath))}");
     #endregion
 
+
+    DicomSetupBuilder.UseServiceProvider(app.Services);
+
+    var logger = app.Services.GetService<Microsoft.Extensions.Logging.ILogger<Program>>();
+
+    var server = DicomServerFactory.Create<DicomSCPService>(_configuration.GetSection("DicomSCPServiceConfig").GetValue<int>("ServerPort"), userState: app.Services, logger: logger);
+
     app.Run();
 
 

IRaCIS.Core.API/Properties/launchSettings.json

@@ -16,69 +16,39 @@
         "ASPNETCORE_ENVIRONMENT": "Test_IRC"
       }
     },
-    "IRaCIS.Test_IRC": {
+    "Uat_HIR": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Test_IRC",
-        "ASPNETCORE_OpenSwagger": "true"
+        "ASPNETCORE_ENVIRONMENT": "Uat_HIR"
       },
       "applicationUrl": "http://localhost:6100"
     },
-    "IRaCIS.Test_IRC_PGSQL": {
+    "Prod_HIR": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Test_IRC_PGSQL"
+        "ASPNETCORE_ENVIRONMENT": "Prod_HIR"
       },
       "applicationUrl": "http://localhost:6100"
     },
-    "IRaCIS.Event_IRC": {
+    "US_HIR": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Event_IRC"
+        "ASPNETCORE_ENVIRONMENT": "US_HIR"
       },
       "applicationUrl": "http://localhost:6100"
     },
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
-      "publishAllPorts": true
-    },
-    "IRaCIS.Uat_IRC": {
+    "Test_HIR": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Uat_IRC"
-      },
-      "applicationUrl": "http://localhost:6100"
-    },
-    "IRaCIS.Prod_IRC": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Prod_IRC"
-      },
-      "applicationUrl": "http://localhost:6100"
-    },
-    "IRaCIS.US_Uat_IRC": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "US_Uat_IRC"
-      },
-      "applicationUrl": "http://localhost:6100"
-    },
-    "IRaCIS.US_Prod_IRC": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "US_Prod_IRC"
+        "ASPNETCORE_ENVIRONMENT": "Test_HIR"
       },
       "applicationUrl": "http://localhost:6100"
     }
 
+
   }
 }

IRaCIS.Core.API/SignalRHub/UploadHub.cs

@@ -3,14 +3,12 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.Logging;
+using System;
 using System.Threading.Tasks;
 
 namespace IRaCIS.Core.API
 {
-    public interface IUploadClient
-    {
-        Task ReceivProgressAsync(string studyInstanceUid, int haveReceivedCount);
-    }
+
 
 
     public class IRaCISUserIdProvider : IUserIdProvider
@@ -21,6 +19,11 @@ namespace IRaCIS.Core.API
         }
     }
 
+    public interface IUploadClient
+    {
+        Task ReceivProgressAsync(string studyInstanceUid, int haveReceivedCount);
+    }
+
     [AllowAnonymous]
     [DisableCors]
     public class UploadHub : Hub<IUploadClient>
@@ -53,5 +56,34 @@ namespace IRaCIS.Core.API
         //    await Clients.All.ReceivProgressAsync(studyInstanceUid, haveReceivedCount);
         //}
 
+    }
+
+
+    public interface IDownloadClient
+    {
+        Task ReceivProgressAsync(string downloadId, object percent);
+    }
+
+
+    [AllowAnonymous]
+    [DisableCors]
+    public class DownloadHub : Hub<IDownloadClient>
+    {
+
+        public ILogger<DownloadHub> _logger { get; set; }
+        public DownloadHub(ILogger<DownloadHub> logger)
+        {
+            _logger = logger;
+        }
+
+        public override Task OnConnectedAsync()
+        {
+            _logger.LogError("连接: " + Context.ConnectionId);
+
+            return base.OnConnectedAsync();
+        }
+
+
+
     }
 }

IRaCIS.Core.API/_PipelineExtensions/LogDashboard/LogDashBoardAuthFilter.cs

@@ -1,15 +0,0 @@
-//using LogDashboard;
-//using LogDashboard.Authorization;
-
-//namespace IRaCIS.Core.API.Filter
-//{
-
-//    public class LogDashBoardAuthFilter : ILogDashboardAuthorizationFilter
-//    {
-//        //在此可以利用 本系统的UerTypeEnum 判断
-//        public bool Authorization(LogDashboardContext context)
-//        {
-//            return context.HttpContext.User.Identity.IsAuthenticated;
-//        }
-//    }
-//}

IRaCIS.Core.API/_PipelineExtensions/Serilog/SerilogConfig.cs

@@ -21,6 +21,7 @@ namespace IRaCIS.Core.API
               =>
             {
 
+
                 opts.MessageTemplate = "{FullName} {UserType} {UserIp} {Host} {RequestMethod} {RequestPath} {RequestBody} responded {StatusCode} in {Elapsed:0.0000} ms";
 
                 opts.EnrichDiagnosticContext = (diagnosticContext, httpContext) =>

IRaCIS.Core.API/_ServiceExtensions/Authorization/JWTAuthSetup.cs

@@ -46,6 +46,8 @@ namespace IRaCIS.Core.API
                        OnMessageReceived = (context) =>
                        {
 
+
+
                            if (context.Request.Query.TryGetValue("access_token", out StringValues values))
                            {
                                var queryToken = values.FirstOrDefault();

IRaCIS.Core.API/_ServiceExtensions/DicomSetup.cs

@@ -1,6 +1,7 @@
 using FellowOakDicom;
 using FellowOakDicom.Imaging;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 
 namespace IRaCIS.Core.API
 {
@@ -9,12 +10,14 @@ namespace IRaCIS.Core.API
         public static void AddDicomSetup(this IServiceCollection services)
         {
             new DicomSetupBuilder()
-            .RegisterServices(s => s.AddFellowOakDicom()
-           .AddTranscoderManager<FellowOakDicom.Imaging.NativeCodec.NativeTranscoderManager>()
-             .AddImageManager<ImageSharpImageManager>()
+            .RegisterServices(s => s.AddFellowOakDicom().AddLogging(config => config.AddConsole())
+            .AddTranscoderManager<FellowOakDicom.Imaging.NativeCodec.NativeTranscoderManager>()
+            //.AddImageManager<ImageSharpImageManager>()
             )
             .SkipValidation()
             .Build();
+
+
         }
     }
 }

IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs

@@ -40,12 +40,12 @@ namespace IRaCIS.Core.API
                 var dbType = configuration.GetSection("ConnectionStrings:Db_Type").Value;
                 if (!string.IsNullOrWhiteSpace(dbType) && dbType == "pgsql")
                 {
-                    options.UseNpgsql(configuration.GetSection("ConnectionStrings:RemoteNew").Value, contextOptionsBuilder => contextOptionsBuilder.EnableRetryOnFailure());
+                    options.UseNpgsql(configuration.GetSection("ConnectionStrings:RemoteNew").Value, contextOptionsBuilder => contextOptionsBuilder.EnableRetryOnFailure().CommandTimeout(90));
 
                 }
                 else
                 {
-                    options.UseSqlServer(configuration.GetSection("ConnectionStrings:RemoteNew").Value, contextOptionsBuilder => contextOptionsBuilder.EnableRetryOnFailure());
+                    options.UseSqlServer(configuration.GetSection("ConnectionStrings:RemoteNew").Value, contextOptionsBuilder => contextOptionsBuilder.EnableRetryOnFailure().CommandTimeout(90));
                 }
 
 
@@ -82,13 +82,16 @@ namespace IRaCIS.Core.API
 
                     triggerOptions.AddTrigger<UserAddTrigger>();
 
-                    triggerOptions.AddTrigger<UserLogAfterTrigger>();
-
                     triggerOptions.AddTrigger<IdenttiyUserRoleInfoTrigger>();
 
+                    triggerOptions.AddTrigger<UserLogAfterTrigger>();
+
                     
 
+
+
                 });
+
             });
 
             // Register an additional context factory as a Scoped service, which gets a pooled context from the Singleton factory we registered above,

IRaCIS.Core.API/_ServiceExtensions/LogDashboardSetup.cs

@@ -1,25 +0,0 @@
-
-//using LogDashboard;
-//using Microsoft.Extensions.DependencyInjection;
-
-//namespace IRaCIS.Core.API
-//{
-//    public static class LogDashboardSetup
-//    {
-//        public static void AddLogDashboardSetup(this IServiceCollection services)
-//        {
-//            //IIS 配置虚拟路径部署，会出现IIS静态文件404
-//            services.AddLogDashboard(opt =>
-//            {
-//                //opt.PathMatch = "/api/LogDashboard";
-//                opt.PathMatch = "/LogDashboard";
-
-//                //opt.AddAuthorizationFilter(new LogDashboardBasicAuthFilter("admin", "zhizhun2018"));
-
-//                //opt.AddAuthorizationFilter(new LogDashBoardAuthFilter());
-
-//            });
-
-//        }
-//    }
-//}

IRaCIS.Core.API/_ServiceExtensions/SerilogSetup.cs

@@ -25,17 +25,16 @@ namespace IRaCIS.Core.API
                    .MinimumLevel.Override("MassTransit", LogEventLevel.Warning)
                     //https://github.com/ZiggyCreatures/FusionCache/blob/main/docs/Logging.md
                     .MinimumLevel.Override("ZiggyCreatures.Caching.Fusion", LogEventLevel.Warning)
-                   
                    // Filter out ASP.NET Core infrastructre logs that are Information and below  日志太多了 一个请求 记录好几条
                    .MinimumLevel.Override("Microsoft.AspNetCore", LogEventLevel.Warning)
                    .MinimumLevel.Override("Microsoft.AspNetCore.Hosting", LogEventLevel.Warning)
                    .MinimumLevel.Override("Microsoft.AspNetCore.Mvc", LogEventLevel.Warning)
                    .MinimumLevel.Override("Microsoft.AspNetCore.Routing", LogEventLevel.Warning)
                    .MinimumLevel.Override("Hangfire", LogEventLevel.Warning)
-                   .Enrich.FromLogContext()   
+                   .Enrich.FromLogContext()
                    .Filter.ByExcluding(logEvent => logEvent.Properties.ContainsKey("RequestPath") && logEvent.Properties["RequestPath"].ToString().Contains("/health"))
                    .WriteTo.Console()
-                   .WriteTo.File($"{AppContext.BaseDirectory}Serilogs/.log", rollingInterval: RollingInterval.Day,retainedFileCountLimit:60);
+                   .WriteTo.File($"{AppContext.BaseDirectory}Serilogs/.log", rollingInterval: RollingInterval.Day);
 
             #region 根据环境配置是否打开错误发送邮件通知
 

IRaCIS.Core.API/_ServiceExtensions/ServiceCollectionSetup.cs

@@ -1,5 +1,6 @@
 using IP2Region.Net.Abstractions;
 using IP2Region.Net.XDB;
+using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.BackGroundJob;
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.Service;

IRaCIS.Core.API/_ServiceExtensions/SwaggerSetup.cs

@@ -16,31 +16,32 @@ namespace IRaCIS.Core.API;
 
 public enum SwaggerVersion
 {
-    [Description("文件记录(FileRecord)")]
-    FileRecord = -1,
+    [Description("HIR修改")]
+    HIR = -1,
 
-    [Description("医生模块(Reviewer)")]
+    [Description("医生模块")]
     Reviewer = 1,
-    [Description("项目模块(Trial)")]
+
+    [Description("项目模块")]
     Trial = 2,
-    [Description("入组模块(Enroll)")]
+    [Description("入组模块")]
     Enroll = 3,
-    [Description("工作量模块(Workload)")]
+    [Description("工作量模块")]
     Workload = 4,
-    [Description("通用信息获取(Common)")]
+    [Description("通用信息获取")]
     Common = 5,
-    [Description("机构信息模块(Institution)")]
+    [Description("机构信息模块")]
     Institution = 6,
-    [Description("统计模块(DashboardStatistics)")]
+    [Description("统计模块")]
     DashboardStatistics = 7,
-    [Description("财务模块(Financial)")]
+    [Description("财务模块")]
     Financial = 8,
-    [Description("管理模块(Management)")]
-    Management =9,
-    [Description("影像模块(Image)")]
-    Image =10,
-    [Description("读片模块(Reading)")]
-    Reading =11
+    [Description("管理模块")]
+    Management = 9,
+    [Description("影像模块")]
+    Image = 10,
+    [Description("读片模块")]
+    Reading = 11
 };
 
 
@@ -118,6 +119,9 @@ public static class SwaggerSetup
 
             //DefaultModelsExpandDepth设置为 - 1 可不显示models
             options.DefaultModelsExpandDepth(-1);
+
+            // 关键一句：关闭外网校验
+            options.ConfigObject.ValidatorUrl = null;
         });
     }
 

IRaCIS.Core.API/_ServiceExtensions/hangfireSetup.cs

@@ -27,8 +27,7 @@ namespace IRaCIS.Core.API
                     hangFireConfig.UseSqlServerStorage(hangFireConnStr, new SqlServerStorageOptions()
                     {
                         SchemaName = "dbo",
-                    }).UseRecommendedSerializerSettings();
-                    // 移除 UseSimpleAssemblyNameTypeSerializer() 以避免类型加载问题
+                    }).UseRecommendedSerializerSettings().UseSimpleAssemblyNameTypeSerializer();
                 }
 
 

IRaCIS.Core.API/appsettings.Event_IRC.json

@@ -1,75 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ConnectionStrings": {
-    "RemoteNew": "Server=101.132.253.119,1435;Database=irc_Prpd_bak;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    "Hangfire": "Server=101.132.253.119,1435;Database=irc_Hangfire_bak;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
-  },
-  "ObjectStoreService": {
-    "ObjectStoreUse": "AliyunOSS",
-    "AliyunOSS": {
-      "RegionId": "cn-shanghai",
-      "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
-      "EndPoint": "https://oss-cn-shanghai.aliyuncs.com",
-      "AccessKeyId": "LTAI5tNRTsqL6aWmHkDmTwoH",
-      "AccessKeySecret": "7mtGz3qrYWI6JMMBZiLeC119VWicZH",
-      "RoleArn": "acs:ram::1899121822495495:role/irc-oss-access",
-      "BucketName": "zy-irc-store",
-      "ViewEndpoint": "https://zy-irc-cache.oss-cn-shanghai.aliyuncs.com",
-      "Region": "oss-cn-shanghai",
-      "DurationSeconds": 7200
-    },
-    "MinIO": {
-      "endpoint": "http://192.168.3.68",
-      "port": "8001",
-      "useSSL": false,
-      "accessKey": "IDFkwEpWej0b4DtiuThL",
-      "secretKey": "Lhuu83yMhVwu7c1SnjvGY6lq74jzpYqifK6Qtj4h",
-      "bucketName": "test"
-    }
-  },
-
-  "BasicSystemConfig": {
-
-    "OpenUserComplexPassword": true,
-
-    "OpenSignDocumentBeforeWork": true,
-
-    "OpenLoginLimit": true,
-    "LoginMaxFailCount": 5,
-
-    "LoginFailLockMinutes": 30,
-    "AutoLoginOutMinutes": 60,
-
-    "ContinuousReadingTimeMin": 120,
-
-    "ReadingRestTimeMin": 10,
-
-    "IsNeedChangePassWord": true,
-
-    "ChangePassWordDays": 90,
-
-    // 模板类型 1 Elevate  2 Extensive
-    "TemplateType": 2
-  },
-  "SystemEmailSendConfig": {
-    "Port": 465,
-    "Host": "smtp.qiye.aliyun.com",
-    "FromEmail": "uat@extimaging.com",
-    "FromName": "UAT_IRC",
-    "AuthorizationCode": "SHzyyl2021",
-    "SiteUrl": "http://irc.event.extimaging.com/login",
-    "CompanyName": "Extensive Imaging",
-    "CompanyNameCN": "上海展影医疗科技有限公司",
-    "CompanyShortName": "Extensive Imaging",
-    "CompanyShortNameCN": "展影医疗",
-    "IsEnv_US": false
-  }
-
-
-}

IRaCIS.Core.API/appsettings.Prod_HIR.json

@@ -0,0 +1,67 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "ObjectStoreService": {
+    "ObjectStoreUse": "MinIO",
+    "MinIO": {
+      "EndPoint": "hir-oss.tres.extimaging.com",
+      "Port": "443",
+      "UseSSL": true,
+      "AccessKeyId": "fbStsVYCIPKHQneeqMwD",
+      "SecretAccessKey": "TzgvyA3zGXMUnpilJNUlyMYHfosl1hBMl6lxPmjy",
+      "BucketName": "hir-images",
+      "ViewEndpoint": "https://hir-oss.tres.extimaging.com/hir-images"
+    }
+
+  },
+  "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"
+  },
+  "BasicSystemConfig": {
+    "OpenUserComplexPassword": true,
+    "OpenSignDocumentBeforeWork": true,
+    "OpenTrialRelationDelete": true,
+    "OpenLoginLimit": false,
+    "LoginMaxFailCount": 5,
+    "LoginFailLockMinutes": 30,
+    "AutoLoginOutMinutes": 120,
+    "AESKey": "HIR_System_AES_Key_Info",
+    "CmoveIntervalMinutes": 1,
+    "CmoveInstanceIntervalMinutes": 1,
+    // 是否强制用户定期修改密码
+    "IsNeedChangePassWord": true,
+    // 密码有效期（天），到期后必须修改
+    "ChangePassWordDays": 1000,
+    "OpenImageShare": true
+  },
+
+  "SystemEmailSendConfig": {
+    "Port": 465,
+    "Host": "smtp.qiye.aliyun.com",
+    "FromEmail": "test@extimaging.com",
+    "FromName": "BCTOP",
+    "AuthorizationCode": "SHzyyl2021",
+    "SiteUrl": "https://bctop.tres.extimaging.com/login",
+    "CompanyName": "BCTOP",
+    "CompanyNameCN": "BCTOP",
+    "CompanyShortName": "BCTOP",
+    "CompanyShortNameCN": "BCTOP",
+    "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$"
+  },
+  "DicomSCPServiceConfig": {
+    "IsSupportThirdService": true,
+    "ThirdSearchPacsAE": "XCPACS",
+    "ThirdCallningAE": "LYAE",
+    "CalledAEList": [
+      "HIRSCUAE",
+      "HIRSCPAE"
+    ],
+    "ServerPort": 11112
+  }
+}

IRaCIS.Core.API/appsettings.Prod_IRC.json

@@ -1,83 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ConnectionStrings": {
-    "RemoteNew": "Server=101.132.193.237,1434;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
-    "Hangfire": "Server=101.132.193.237,1434;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
-    //"RemoteNew": "Server=prod_mssql_standard,1433;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
-    //"Hangfire": "Server=prod_mssql_standard,1433;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
-  },
-  "ObjectStoreService": {
-    "ObjectStoreUse": "AliyunOSS",
-    "AliyunOSS": {
-      "RegionId": "cn-shanghai",
-      "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
-      "EndPoint": "https://oss-cn-shanghai.aliyuncs.com",
-      "AccessKeyId": "LTAI5tNRTsqL6aWmHkDmTwoH",
-      "AccessKeySecret": "7mtGz3qrYWI6JMMBZiLeC119VWicZH",
-      "RoleArn": "acs:ram::1899121822495495:role/irc-oss-access",
-      "BucketName": "zy-irc-store",
-      "ViewEndpoint": "https://zy-irc-cache.oss-cn-shanghai.aliyuncs.com",
-      "Region": "oss-cn-shanghai",
-      "DurationSeconds": 7200
-    },
-    "MinIO": {
-      "endpoint": "http://192.168.3.68",
-      "port": "8001",
-      "useSSL": false,
-      "accessKey": "IDFkwEpWej0b4DtiuThL",
-      "secretKey": "Lhuu83yMhVwu7c1SnjvGY6lq74jzpYqifK6Qtj4h",
-      "bucketName": "test"
-    }
-  },
-  "BasicSystemConfig": {
-
-    "OpenUserComplexPassword": true,
-    "OpenSignDocumentBeforeWork": true,
-
-    "OpenLoginLimit": true,
-    "LoginMaxFailCount": 5,
-    "LoginFailLockMinutes": 30,
-    "AutoLoginOutMinutes": 120,
-
-    "OpenLoginMFA": false,
-
-    "ContinuousReadingTimeMin": 120,
-    "ReadingRestTimeMin": 10,
-
-    "IsNeedChangePassWord": true,
-    "ChangePassWordDays": 90,
-    // 模板类型 1 Elevate  2 Extensive
-    "TemplateType": 2
-  },
-
-  "SystemEmailSendConfig": {
-    "Port": 465,
-    "Host": "smtp.qiye.aliyun.com",
-    "FromEmail": "irc@extimaging.com",
-    "FromName": "IRC Imaging System",
-    "AuthorizationCode": "ExtImg@2022",
-    "SiteUrl": "http://irc.extimaging.com/login",
-    "SystemShortName": "IRC",
-    "OrganizationName": "Extlmaging",
-    "OrganizationNameCN": "Extlmaging",
-    "CompanyName": "Extensive Imaging",
-    "CompanyNameCN": "上海展影医疗科技有限公司",
-    "CompanyShortName": "Extensive Imaging",
-    "CompanyShortNameCN": "展影医疗",
-    "IsEnv_US": false,
-    "IsOpenErrorNoticeEmail": false,
-    "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
-    "ErrorNoticeEmailList": [ "872297557@qq.com" ]
-  },
-  "SystemPacsConfig": {
-    "Port": "11113",
-    "IP": "101.132.193.237"
-  }
-
-}

IRaCIS.Core.API/appsettings.TJ_Prod_HIR.json

@@ -0,0 +1,62 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "ObjectStoreService": {
+    "ObjectStoreUse": "MinIO",
+    "MinIO": {
+      "EndPoint": "192.168.40.99",
+      "Port": "9000",
+      "UseSSL": false,
+      "AccessKeyId": "Jnywl9aIw83yewZIJKod",
+      "SecretAccessKey": "N83bTzoJGkg4OLW8x54IZRwwSvdxcdYi9UZ2BYII",
+      "BucketName": "tj-hir",
+      "ViewEndpoint": "http://192.168.40.99:9000/tj-hir"
+    }
+
+  },
+  "ConnectionStrings": {
+    "RemoteNew": "Server=192.168.40.98,1433;Database=TJ_Prod_HIR;User ID=sa;Password=xc_123456;TrustServerCertificate=true",
+    "Hangfire": "Server=192.168.40.98,1433;Database=TJ_Prod_HIR_Hangfire;User ID=sa;Password=xc_123456;TrustServerCertificate=true"
+  },
+  "BasicSystemConfig": {
+    "OpenUserComplexPassword": true,
+    "OpenSignDocumentBeforeWork": false,
+    "OpenTrialRelationDelete": false,
+    "OpenLoginLimit": true,
+    "LoginMaxFailCount": 5,
+    "LoginFailLockMinutes": 30,
+    "AutoLoginOutMinutes": 120,
+    "AESKey": "HIR_System_AES_Key_Info",
+    "CmoveIntervalMinutes": 1,
+    "CmoveInstanceIntervalMinutes": 1
+  },
+  "SystemHospitalConfig": {
+    "HospitalCode": "EI",
+    "HospitalLogoPath": "/System/GeneralDocuments/1716453306898_图片2.png",
+    "TrialKeepCount": 60,
+    "HospitalName": "上海展影医疗科技有限公司",
+    "HospitalAliasName": "展影医疗",
+    "Country": "中国",
+    "City": "上海",
+    "Province": "上海",
+    "Address": "上海市杨浦区国泰路复旦科技园",
+    "Phone": "021-60702575",
+    "IsCanConnectInternet": false
+  },
+  "SystemEmailSendConfig": {
+    "Port": 465,
+    "Host": "smtp.qiye.aliyun.com",
+    "FromEmail": "test-study@extimaging.com",
+    "FromName": "Test_HIR",
+    "AuthorizationCode": "zhanying123",
+    "SiteUrl": "http://hir.test.extimaging.com/login"
+  }
+}
+
+
+

IRaCIS.Core.API/appsettings.Test_HIR.json

@@ -0,0 +1,71 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "ObjectStoreService": {
+    "ObjectStoreUse": "MinIO",
+    "MinIO": {
+      "EndPoint": "hir-oss.test.extimaging.com",
+      "Port": "443",
+      "UseSSL": true,
+      //"endPoint": "106.14.89.110",
+      //"port": "9001",
+      //"useSSL": false,
+      "AccessKeyId": "fbStsVYCIPKHQneeqMwD",
+      "SecretAccessKey": "TzgvyA3zGXMUnpilJNUlyMYHfosl1hBMl6lxPmjy",
+      "BucketName": "hir-test",
+      //"viewEndpoint": "https://hir.test.extimaging.com/oss/hir-test"
+      "ViewEndpoint": "https://hir-oss.test.extimaging.com/hir-test"
+    }
+
+  },
+  "ConnectionStrings": {
+    "RemoteNew": "Server=106.14.89.110,1435;Database=Test_HIR_New;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    "Hangfire": "Server=106.14.89.110,1435;Database=Test_HIR_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
+  },
+  "BasicSystemConfig": {
+    "OpenUserComplexPassword": true,
+    "OpenSignDocumentBeforeWork": true,
+    "OpenTrialRelationDelete": true,
+    "OpenLoginLimit": false,
+    "LoginMaxFailCount": 5,
+    "LoginFailLockMinutes": 30,
+    "AutoLoginOutMinutes": 120,
+    "AESKey": "HIR_System_AES_Key_Info",
+    "CmoveIntervalMinutes": 1,
+    "CmoveInstanceIntervalMinutes": 1,
+    // 是否强制用户定期修改密码
+    "IsNeedChangePassWord": true,
+    // 密码有效期（天），到期后必须修改
+    "ChangePassWordDays": 1000,
+    "OpenImageShare": true
+  },
+
+  "SystemEmailSendConfig": {
+    "Port": 465,
+    "Host": "smtp.qiye.aliyun.com",
+    "FromEmail": "test-study@extimaging.com",
+    "FromName": "Test_HIR",
+    "AuthorizationCode": "zhanying123",
+    "SiteUrl": "http://hir.test.extimaging.com/login",
+    "CompanyName": "Extensive Imaging",
+    "CompanyNameCN": "上海展影医疗科技有限公司",
+    "CompanyShortName": "Extensive Imaging",
+    "CompanyShortNameCN": "展影医疗",
+    "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$"
+  },
+  "DicomSCPServiceConfig": {
+    "IsSupportThirdService": true,
+    "ThirdSearchPacsAE": "XCPACS",
+    "ThirdCallningAE": "LYAE",
+    "CalledAEList": [
+      "HIRSCUAE",
+      "HIRSCPAE"
+    ],
+    "ServerPort": 11112
+  }
+}

IRaCIS.Core.API/appsettings.Test_IRC.json

@@ -1,164 +1,103 @@
 {
-  // 日志信息
   "Logging": {
-    // 日志等级
     "LogLevel": {
-      // 默认日志等级
       "Default": "Information",
-      // 调试日志等级
       "Microsoft": "Warning",
-      // ASP.NET Core 日志等级
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
-  // 数据库链接字符串
   "ConnectionStrings": {
-    // 本地数据库链接字符串
     "RemoteNew": "Server=106.14.89.110,1435;Database=Test_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    // Hangfire 定时任务数据库链接字符串
     "Hangfire": "Server=106.14.89.110,1435;Database=Test_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
   },
-  // 对象存储服务配置
+
   "ObjectStoreService": {
-    // 使用的对象存储服务类型
+
     "ObjectStoreUse": "AliyunOSS",
-    // 阿里云对象存储服务的配置
+
     "AliyunOSS": {
-      // 阿里云 OSS 的 Region ID
       "RegionId": "cn-shanghai",
-      // 阿里云 OSS 的内部访问端点
       "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
-      // 阿里云 OSS 的外部访问端点
       "EndPoint": "https://oss-cn-shanghai.aliyuncs.com",
-      // 阿里云 OSS 的访问密钥 ID
       "AccessKeyId": "LTAI5tRRZehUp2V9pyTPtAJm",
-      // 阿里云 OSS 的访问密钥 Secret
       "AccessKeySecret": "FLizxkHsMm4CGYHtkV8E3PNJJZU7oV",
-      // 阿里云 OSS 的角色 ARN
       "RoleArn": "acs:ram::1899121822495495:role/dev-oss-access",
-      // 阿里云 OSS 的Bucket名称
       "BucketName": "zy-irc-test-store",
-      // 阿里云 OSS 的访问端点
-      "ViewEndpoint": "https://zy-irc-test-dev-cache.oss-cn-shanghai.aliyuncs.com",
-      // 阿里云 OSS 的预览端点
+      "ViewEndpoint": "https://zy-irc-test-store.oss-cn-shanghai.aliyuncs.com",
       "Region": "oss-cn-shanghai",
-      // 阿里云 OSS 的临时访问凭证有效时间（秒）
-      "DurationSeconds": 7200,
-      // 阿里云 OSS 的预览端点
-      "PreviewEndpoint": "https://test-oss.test.extimaging.com"
+      "DurationSeconds": 7200
     },
-    // MinIO 对象存储服务的配置
     "MinIO": {
-      // MinIO 的访问端点
       "EndPoint": "hir-oss.test.extimaging.com",
-      // MinIO 的端口
       "Port": "443",
-      // 是否使用 SSL
       "UseSSL": true,
-      // MinIO 的角色 ARN
       "AccessKey": "fbStsVYCIPKHQneeqMwD",
-      // MinIO 的访问密钥
       "SecretKey": "TzgvyA3zGXMUnpilJNUlyMYHfosl1hBMl6lxPmjy",
-      // MinIO 的BucketName
       "BucketName": "irc-test",
-      // MinIO 的访问端点
       "ViewEndpoint": "https://hir-oss.test.extimaging.com/irc-test"
     },
-    // AWS S3 对象存储服务的配置
     "AWS": {
-      // AWS S3 的Region
       "Region": "us-east-1",
-      // AWS S3 的内部访问端点
       "EndPoint": "s3.us-east-1.amazonaws.com",
-      // 是否使用 SSL
       "UseSSL": true,
-      // AWS S3 的角色 ARN
       "RoleArn": "arn:aws:iam::471112624751:role/uat_s3_access",
-      // AWS S3 的访问密钥 ID
       "AccessKeyId": "AKIAW3MEAFJX7IPXISP4",
-      // AWS S3 的访问密钥 Secret
       "SecretAccessKey": "Pgrg3le5jPxZQ7MR1yYNS30J0XRyJeKVyIIjElXc",
-      // AWS S3 的Bucket名称
       "BucketName": "ei-med-s3-lili-uat-store",
-      // AWS S3 的访问端点
       "ViewEndpoint": "https://ei-med-s3-lili-uat-store.s3.amazonaws.com",
-      // AWS S3 的持续数秒
       "DurationSeconds": 7200
     }
   },
-  // 系统配置
+
   "BasicSystemConfig": {
-    // 打开用户复杂密码
+
     "OpenUserComplexPassword": false,
-    // 是否在开始工作前强制签署电子知情同意书
+
     "OpenSignDocumentBeforeWork": false,
-    // 是否启用登录失败次数限制（防暴力破解）
-    "OpenLoginLimit": false,
-    // 连续登录失败多少次后触发锁定
-    "LoginMaxFailCount": 5,
-    // 触发锁定后账号锁定时长（分钟）
-    "LoginFailLockMinutes": 1,
-    // 无操作自动登出的超时时间（分钟）
-    "AutoLoginOutMinutes": 10,
-    // 是否启用多因子登录认证（MFA）
-    "OpenLoginMFA": false,
-    // 连续阅片的最长工作时间（分钟），超时后强制休息
-    "ContinuousReadingTimeMin": 120,
-    // 强制休息时长（分钟）
-    "ReadingRestTimeMin": 10,
-    // 是否强制用户定期修改密码
-    "IsNeedChangePassWord": true,
-    // 密码有效期（天），到期后必须修改
-    "ChangePassWordDays": 90,
-    // 模板类型 1 Elevate  2 Extensive
-    "TemplateType": 2,
-    // 是否打开项目关联删除
+
     "OpenTrialRelationDelete": true,
-    // 转换PDF服务配置
+
+    "OpenLoginLimit": false,
+
+    "LoginMaxFailCount": 5,
+
+    "LoginFailLockMinutes": 1,
+
+    "AutoLoginOutMinutes": 1,
+
+    "OpenLoginMFA": false,
+
+    "ContinuousReadingTimeMin": 120,
+
+    "ReadingRestTimeMin": 10,
+    "IsNeedChangePassWord": true,
+
+    "ChangePassWordDays": 90,
+
     "ThirdPdfUrl": "http://106.14.89.110:30088/api/v1/convert/file/pdf"
   },
-  // 邮件服务配置（用于系统通知、找回密码、错误报警等）
+
   "SystemEmailSendConfig": {
-    // SMTP端口
     "Port": 465,
-    // 企业邮箱SMTP服务器地址
     "Host": "smtp.qiye.aliyun.com",
-    // 发件人邮箱地址
     "FromEmail": "test@extimaging.com",
-    // 发件人显示名称
-    "FromName": "Test IRC Imaging System",
-    // SMTP授权码
+    "FromName": "Test_IRC",
     "AuthorizationCode": "SHzyyl2021",
-    // 系统对外访问地址
     "SiteUrl": "http://irc.test.extimaging.com/login",
-    // 系统简称
-    "SystemShortName": "IRC",
-    // 组织英文名称
+
     "OrganizationName": "Extlmaging",
-    // 组织中文名称
     "OrganizationNameCN": "Extlmaging",
-    // 公司英文全称
     "CompanyName": "Extensive Imaging",
-    // 公司中文全称
     "CompanyNameCN": "上海展影医疗科技有限公司",
-    // 公司英文简称
     "CompanyShortName": "Extensive Imaging",
-    // 公司中文简称
     "CompanyShortNameCN": "展影医疗",
-    // 是否为国际版环境
     "IsEnv_US": false,
-    // 是否开启系统异常邮件报警
     "IsOpenErrorNoticeEmail": false,
-    // 邮箱格式校验正则表达式
-    "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
-    // 接收系统异常报警的邮箱列表
-    "ErrorNoticeEmailList": [ "872297557@qq.com" ]
+    "ErrorNoticeEmailList": ["872297557@qq.com"]
   },
-  // PACS 连接配置
+
   "SystemPacsConfig": {
-    // PACS服务器端口
     "Port": "11113",
-    // PACS服务器IP地址
     "IP": "106.14.89.110"
   }
 }

IRaCIS.Core.API/appsettings.Test_IRC_PGSQL.json

@@ -1,95 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ConnectionStrings": {
-    "Db_Type": "pgsql",
-    "RemoteNew": "Host=106.14.89.110;Port=5432;Username=sa;Password=pgsql_pwd;Database=Test2_PG",
-    "Hangfire": "Server=106.14.89.110,1435;Database=Test_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
-  },
-
-  "ObjectStoreService": {
-
-    "ObjectStoreUse": "AliyunOSS",
-
-    "AliyunOSS": {
-      "regionId": "cn-shanghai",
-      "internalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
-      "endPoint": "https://oss-cn-shanghai.aliyuncs.com",
-      "accessKeyId": "LTAI5tKvzs7ed3UfSpNk3xwQ",
-      "accessKeySecret": "zTIceGEShlZDGnLrCFfIGFE7TXVRio",
-      "bucketName": "zy-irc-test-store",
-      "roleArn": "acs:ram::1899121822495495:role/oss-upload",
-      "viewEndpoint": "https://zy-irc-test-store.oss-cn-shanghai.aliyuncs.com",
-      "region": "oss-cn-shanghai"
-    },
-    "MinIO": {
-      "endPoint": "hir-oss.test.extimaging.com",
-      "port": "443",
-      "useSSL": true,
-      "accessKey": "fbStsVYCIPKHQneeqMwD",
-      "secretKey": "TzgvyA3zGXMUnpilJNUlyMYHfosl1hBMl6lxPmjy",
-      "bucketName": "irc-test",
-      "viewEndpoint": "https://hir-oss.test.extimaging.com/irc-test"
-    },
-    "AWS": {
-      "endPoint": "s3.us-east-1.amazonaws.com",
-      "useSSL": true,
-      "accessKey": "AKIAZQ3DRSOHFPJJ6FEU",
-      "secretKey": "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",
-      "bucketName": "ei-irc-test-store",
-      "viewEndpoint": "https://ei-irc-test-store.s3.amazonaws.com/"
-    }
-  },
-
-  "BasicSystemConfig": {
-
-    "OpenUserComplexPassword": false,
-
-    "OpenSignDocumentBeforeWork": false,
-
-    "OpenTrialRelationDelete": true,
-
-    "OpenLoginLimit": false,
-
-    "LoginMaxFailCount": 5,
-
-    "LoginFailLockMinutes": 1,
-
-    "AutoLoginOutMinutes": 1,
-
-    "OpenLoginMFA": false,
-
-    "ContinuousReadingTimeMin": 120,
-
-    "ReadingRestTimeMin": 10,
-    "IsNeedChangePassWord": true,
-
-    "ChangePassWordDays": 90
-  },
-
-  "SystemEmailSendConfig": {
-    "Port": 465,
-    "Host": "smtp.qiye.aliyun.com",
-    "FromEmail": "test@extimaging.com",
-    "FromName": "Test_IRC",
-    "AuthorizationCode": "SHzyyl2021",
-    "SiteUrl": "http://irc.test.extimaging.com/login",
-
-    "OrganizationName": "Extlmaging",
-    "OrganizationNameCN": "Extlmaging",
-    "CompanyName": "Extensive Imaging",
-    "CompanyNameCN": "上海展影医疗科技有限公司",
-    "CompanyShortName": "Extensive Imaging",
-    "CompanyShortNameCN": "展影医疗"
-  },
-
-  "SystemPacsConfig": {
-    "Port": "11113",
-    "IP": "106.14.89.110"
-  }
-}

IRaCIS.Core.API/appsettings.US_HIR.json

@@ -0,0 +1,68 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "ObjectStoreService": {
+    "ObjectStoreUse": "MinIO",
+    "MinIO": {
+      "EndPoint": "hir-minio.uat.elevateimaging.ai",
+      "Port": "443",
+      "UseSSL": true,
+      "AccessKeyId": "7rvVIHs7D6pbyscRcJhz",
+      "SecretAccessKey": "DQsCQldHFL3QRjlnaLWV7oM4E9PtsO21QPC2h9BD",
+      "BucketName": "hir-us",
+      //"viewEndpoint": "https://hir.test.extimaging.com/oss/hir-test"
+      "ViewEndpoint": "https://hir-minio.uat.elevateimaging.ai/hir-us"
+    }
+
+  },
+  "ConnectionStrings": {
+    "RemoteNew": "Server=3.226.182.187,1435;Database=US_HIR;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    "Hangfire": "Server=3.226.182.187,1435;Database=US_HIR_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
+  },
+  "BasicSystemConfig": {
+    "OpenUserComplexPassword": true,
+    "OpenSignDocumentBeforeWork": true,
+    "OpenTrialRelationDelete": true,
+    "OpenLoginLimit": true,
+    "LoginMaxFailCount": 5,
+    "LoginFailLockMinutes": 30,
+    "AutoLoginOutMinutes": 120,
+    "AESKey": "HIR_System_AES_Key_Info",
+    "CmoveIntervalMinutes": 1,
+    "CmoveInstanceIntervalMinutes": 1,
+    // 是否强制用户定期修改密码
+    "IsNeedChangePassWord": true,
+    // 密码有效期（天），到期后必须修改
+    "ChangePassWordDays": 1000,
+    "OpenImageShare": true
+  },
+
+  "SystemEmailSendConfig": {
+    "Port": 465,
+    "Host": "smtp.qiye.aliyun.com",
+    "FromEmail": "uat-study@extimaging.com",
+    "FromName": "Uat_HIR",
+    "AuthorizationCode": "zhanying123",
+    "SiteUrl": "https://hir.uat.elevateimaging.ai/login",
+    "CompanyName": "Extensive Imaging",
+    "CompanyNameCN": "上海展影医疗科技有限公司",
+    "CompanyShortName": "Extensive Imaging",
+    "CompanyShortNameCN": "展影医疗",
+    "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$"
+  },
+  "DicomSCPServiceConfig": {
+    "IsSupportThirdService": true,
+    "ThirdSearchPacsAE": "XCPACS",
+    "ThirdCallningAE": "LYAE",
+    "CalledAEList": [
+      "HIRSCUAE",
+      "HIRSCPAE"
+    ],
+    "ServerPort": 11112
+  }
+}

IRaCIS.Core.API/appsettings.US_Prod_IRC.json

@@ -1,90 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ConnectionStrings": {
-    "RemoteNew": "Server=us-mssql-prod,1433;Database=US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    "Hangfire": "Server=us-mssql-prod,1433;Database=US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
-    //"RemoteNew": "Server=44.210.231.169,1435;Database=US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    //"Hangfire": "Server=44.210.231.169,1435;Database=US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-  },
-
-  "ObjectStoreService": {
-    "ObjectStoreUse": "AWS",
-    "MinIO": {
-      "endPoint": "44.210.231.169",
-      "port": "9001",
-      "useSSL": false,
-      "accessKey": "e9bT1isTOqSAUxb6wd4n",
-      "secretKey": "b5TaDzNdQCBtCvfm8eZ3dR6yY7tfZu2JYze2Po1i",
-      "bucketName": "prod-irc-us",
-      "viewEndpoint": "http://44.210.231.169:9001/prod-irc-us/"
-    },
-
-    "AWS": {
-      "Region": "us-east-1",
-      "EndPoint": "s3.us-east-1.amazonaws.com",
-      "UseSSL": true,
-      "RoleArn": "arn:aws:iam::471112624751:role/lili_s3_access",
-      "AccessKeyId": "AKIAW3MEAFJXZ2TZK7GM",
-      "SecretAccessKey": "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",
-      "BucketName": "ei-med-s3-lili-store",
-      "ViewEndpoint": "https://ei-med-s3-lili-store.s3.amazonaws.com",
-      "DurationSeconds": 7200
-    }
-  },
-  "BasicSystemConfig": {
-
-    "OpenUserComplexPassword": true,
-    "OpenSignDocumentBeforeWork": true,
-
-    "OpenLoginLimit": true,
-    "LoginMaxFailCount": 5,
-    "LoginFailLockMinutes": 30,
-    "AutoLoginOutMinutes": 120,
-
-    "OpenLoginMFA": true,
-
-    "ContinuousReadingTimeMin": 120,
-    "ReadingRestTimeMin": 10,
-
-    "IsNeedChangePassWord": true,
-    "ChangePassWordDays": 90,
-    // 模板类型 1 Elevate  2 Extensive
-    "TemplateType": 1,
-
-    "OpenTrialRelationDelete": false
-
-  },
-
-  "SystemEmailSendConfig": {
-    "Port": 587,
-    "Host": "smtp-mail.outlook.com",
-    "FromEmail": "donotreply@elevateimaging.ai",
-    "FromName": "LiLi System",
-    "AuthorizationCode": "Q#669869497420ul",
-
-    "SystemShortName": "LiLi",
-    "OrganizationName": "Elevate Imaging",
-    "OrganizationNameCN": "Elevate Imaging",
-    "CompanyName": "Elevate Imaging Inc.",
-    "CompanyNameCN": "上海展影医疗科技有限公司",
-    "CompanyShortName": "Elevate Imaging",
-    "CompanyShortNameCN": "展影医疗",
-    "SiteUrl": "https://lili.elevateimaging.ai/login",
-    "IsEnv_US": true,
-    "IsOpenErrorNoticeEmail": false,
-    "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
-    "ErrorNoticeEmailList": [ "872297557@qq.com" ]
-  },
-
-  "SystemPacsConfig": {
-    "Port": "104",
-    "IP": "44.210.231.169"
-  }
-
-}

IRaCIS.Core.API/appsettings.US_Test_IRC.json

@@ -1,97 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ConnectionStrings": {
-    "RemoteNew": "Server=106.14.89.110,1435;Database=Test_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    "Hangfire": "Server=106.14.89.110,1435;Database=Test_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
-  },
-
-  "ObjectStoreService": {
-
-    "ObjectStoreUse": "AWS",
-    "MinIO": {
-      //"endPoint": "hir-oss.uat.extimaging.com",
-      //"port": "443",
-      //"useSSL": true,
-      //"viewEndpoint": "https://hir-oss.uat.extimaging.com/hir-uat",
-
-      "endPoint": "47.117.164.182",
-      "port": "9001",
-      "useSSL": false,
-      "viewEndpoint": "http://47.117.164.182:9001/test-irc-us",
-
-      "accessKey": "b9Ul0e98xPzt6PwRXA1Q",
-      "secretKey": "DzMaU2L4OXl90uytwOmDXF2encN0Jf4Nxu2XkYqQ",
-      "bucketName": "test-irc-us"
-
-    },
-
-    "AWS": {
-      "Region": "us-east-1",
-      "EndPoint": "s3.us-east-1.amazonaws.com",
-      "UseSSL": true,
-      "RoleArn": "arn:aws:iam::471112624751:role/uat_s3_access",
-      "AccessKeyId": "AKIAW3MEAFJX7IPXISP4",
-      "SecretAccessKey": "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",
-      "BucketName": "ei-med-s3-lili-uat-store",
-      "ViewEndpoint": "https://ei-med-s3-lili-uat-store.s3.amazonaws.com",
-      "DurationSeconds": 7200
-    }
-  },
-  "BasicSystemConfig": {
-
-    "OpenUserComplexPassword": true,
-
-    "OpenSignDocumentBeforeWork": true,
-
-    "OpenTrialRelationDelete": true,
-
-    "OpenLoginLimit": true,
-
-    "LoginMaxFailCount": 5,
-
-    "LoginFailLockMinutes": 30,
-    "AutoLoginOutMinutes": 60,
-
-    "ContinuousReadingTimeMin": 120,
-
-    "ReadingRestTimeMin": 10,
-    "IsNeedChangePassWord": true,
-
-    "ChangePassWordDays": 90,
-    // 模板类型 1 Elevate  2 Extensive
-    "TemplateType": 1,
-    "OpenLoginMFA": true
-  },
-
-  "SystemEmailSendConfig": {
-    "Port": 587,
-    "Host": "smtp-mail.outlook.com",
-    "FromEmail": "donotreply@elevateimaging.ai",
-    "FromName": "LiLi System",
-    "AuthorizationCode": "Q#669869497420ul",
-
-    "SystemShortName": "LiLi",
-    "OrganizationName": "Elevate Imaging",
-    "OrganizationNameCN": "Elevate Imaging",
-    "CompanyName": "Elevate Imaging Inc.",
-    "CompanyNameCN": "上海展影医疗科技有限公司",
-    "CompanyShortName": "Elevate Imaging",
-    "CompanyShortNameCN": "展影医疗",
-    "SiteUrl": "https://lili.test.elevateimaging.ai/login",
-    "IsEnv_US": true,
-    "IsOpenErrorNoticeEmail": false,
-    "ErrorNoticeEmailList": [ "872297557@qq.com" ]
-  },
-
-  "SystemPacsConfig": {
-    "Port": "104",
-    "IP": "3.226.182.187"
-  }
-
-}

IRaCIS.Core.API/appsettings.US_Uat_IRC.json

@@ -1,97 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ConnectionStrings": {
-    //"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=3.226.182.187,1435;Database=US_Uat_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    "Hangfire": "Server=3.226.182.187,1435;Database=US_Uat_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
-  },
-
-  "ObjectStoreService": {
-
-    "ObjectStoreUse": "AWS",
-
-    "MinIO": {
-      //"endPoint": "hir-minio.uat.elevateimaging.ai",
-      //"port": "443",
-      //"useSSL": true,
-      //"viewEndpoint": "https://hir-minio.uat.elevateimaging.ai/uat-irc-us",
-
-      "endPoint": "3.226.182.187",
-      "port": "9001",
-      "useSSL": false,
-      "viewEndpoint": "http://44.218.11.19:9001/uat-irc-us",
-
-      "accessKey": "lH8DkKskLuDqPaiubuSQ",
-      "secretKey": "pdPdicvvLeH7xAC5yFUrI7odMyBfOXxvVWMvKYV4",
-      "bucketName": "uat-irc-us"
-
-    },
-
-    "AWS": {
-      "Region": "us-east-1",
-      "EndPoint": "s3.us-east-1.amazonaws.com",
-      "UseSSL": true,
-      "RoleArn": "arn:aws:iam::471112624751:role/uat_s3_access",
-      "AccessKeyId": "AKIAW3MEAFJX7IPXISP4",
-      "SecretAccessKey": "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",
-      "BucketName": "ei-med-s3-lili-uat-store",
-      "ViewEndpoint": "https://ei-med-s3-lili-uat-store.s3.amazonaws.com",
-      "DurationSeconds": 7200
-    }
-  },
-  "BasicSystemConfig": {
-
-    "OpenUserComplexPassword": true,
-    "OpenSignDocumentBeforeWork": true,
-
-    "OpenLoginLimit": true,
-    "LoginMaxFailCount": 5,
-    "LoginFailLockMinutes": 30,
-    "AutoLoginOutMinutes": 120,
-
-    "OpenLoginMFA": true,
-
-    "ContinuousReadingTimeMin": 120,
-    "ReadingRestTimeMin": 10,
-
-    "IsNeedChangePassWord": true,
-    "ChangePassWordDays": 90,
-    // 模板类型 1 Elevate  2 Extensive
-    "TemplateType": 1
-  },
-
-  "SystemEmailSendConfig": {
-    "Port": 587,
-    "Host": "smtp-mail.outlook.com",
-    "FromEmail": "donotreply@elevateimaging.ai",
-    "FromName": "LiLi System",
-    "AuthorizationCode": "Q#669869497420ul",
-
-    "SystemShortName": "LiLi",
-    "OrganizationName": "Elevate Imaging",
-    "OrganizationNameCN": "Elevate Imaging",
-    "CompanyName": "Elevate Imaging Inc.",
-    "CompanyNameCN": "上海展影医疗科技有限公司",
-    "CompanyShortName": "Elevate Imaging",
-    "CompanyShortNameCN": "展影医疗",
-    "SiteUrl": "https://lili.uat.elevateimaging.ai/login",
-    "IsEnv_US": true,
-    "IsOpenErrorNoticeEmail": false,
-    "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
-    "ErrorNoticeEmailList": [ "872297557@qq.com" ]
-  },
-
-  "SystemPacsConfig": {
-    "Port": "104",
-    "IP": "3.226.182.187"
-  }
-
-}

IRaCIS.Core.API/appsettings.Uat_HIR.json

@@ -0,0 +1,69 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "ObjectStoreService": {
+    "ObjectStoreUse": "MinIO",
+    "MinIO": {
+      "EndPoint": "hir-oss.uat.extimaging.com",
+      "Port": "443",
+      "UseSSL": true,
+      //"endPoint": "106.14.89.110",
+      //"port": "9001",
+      //"useSSL": false,
+      "AccessKeyId": "L6owzRVeDJJw3PcRmK2c",
+      "SecretAccessKey": "2XvFDYSH7EyHQNtpDCgk4efgdsdarQmRKgx1LlOI",
+      "BucketName": "hir-uat",
+      "ViewEndpoint": "https://hir-oss.uat.extimaging.com/hir-uat"
+    }
+
+  },
+  "ConnectionStrings": {
+    "RemoteNew": "Server=101.132.253.119,1435;Database=Uat_HIR_New;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    "Hangfire": "Server=101.132.253.119,1435;Database=Uat_HIR_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
+  },
+  "BasicSystemConfig": {
+    "OpenUserComplexPassword": true,
+    "OpenSignDocumentBeforeWork": false,
+    "OpenTrialRelationDelete": false,
+    "OpenLoginLimit": true,
+    "LoginMaxFailCount": 5,
+    "LoginFailLockMinutes": 30,
+    "AutoLoginOutMinutes": 120,
+    "AESKey": "HIR_System_AES_Key_Info",
+    "CmoveIntervalMinutes": 1,
+    "CmoveInstanceIntervalMinutes": 1,
+    // 是否强制用户定期修改密码
+    "IsNeedChangePassWord": true,
+    // 密码有效期（天），到期后必须修改
+    "ChangePassWordDays": 1000,
+    "OpenImageShare": true
+  },
+  "SystemEmailSendConfig": {
+    "Port": 465,
+    "Host": "smtp.qiye.aliyun.com",
+    "FromEmail": "test-study@extimaging.com",
+    "FromName": "Test_HIR",
+    "AuthorizationCode": "zhanying123",
+    "SiteUrl": "http://hir.test.extimaging.com/login",
+    "CompanyName": "Extensive Imaging",
+    "CompanyNameCN": "上海展影医疗科技有限公司",
+    "CompanyShortName": "Extensive Imaging",
+    "CompanyShortNameCN": "展影医疗",
+    "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$"
+  },
+  "DicomSCPServiceConfig": {
+    "IsSupportThirdService": true,
+    "ThirdSearchPacsAE": "XCPACS",
+    "ThirdCallningAE": "LYAE",
+    "CalledAEList": [
+      "HIRSCUAE",
+      "HIRSCPAE"
+    ],
+    "ServerPort": 11112
+  }
+}

IRaCIS.Core.API/appsettings.Uat_IRC.json

@@ -1,104 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ConnectionStrings": {
-    "RemoteNew": "Server=101.132.253.119,1435;Database=Uat_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    "Hangfire": "Server=101.132.253.119,1435;Database=Uat_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
-  },
-  "ObjectStoreService": {
-
-    "ObjectStoreUse": "AliyunOSS",
-
-    "AliyunOSS": {
-      "RegionId": "cn-shanghai",
-      "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
-      "EndPoint": "https://oss-cn-shanghai.aliyuncs.com",
-      "AccessKeyId": "LTAI5tFUCCmz5TwghZHsj45Y",
-      "AccessKeySecret": "8evrBy1fVfzJG25i67Jm0xqn9Xcw2T",
-      "RoleArn": "acs:ram::1078130221702011:role/uat-oss-access",
-      "BucketName": "tl-med-irc-uat-store",
-      "ViewEndpoint": "https://tl-med-irc-uat-store.oss-cn-shanghai.aliyuncs.com",
-      "Region": "oss-cn-shanghai",
-      "DurationSeconds": 7200
-    },
-
-    "MinIO": {
-      "endPoint": "hir-oss.uat.extimaging.com",
-      "port": "80",
-      "useSSL": false,
-      "viewEndpoint": "http://hir-oss.uat.extimaging.com/irc-uat",
-      //"port": "443",
-      //"useSSL": true,
-      //"viewEndpoint": "https://hir-oss.uat.extimaging.com/irc-uat",
-      "accessKey": "b9Ul0e98xPzt6PwRXA1Q",
-      "secretKey": "DzMaU2L4OXl90uytwOmDXF2encN0Jf4Nxu2XkYqQ",
-      "bucketName": "irc-uat"
-
-    },
-    "AWS": {
-      "Region": "us-east-1",
-      "EndPoint": "s3.us-east-1.amazonaws.com",
-      "UseSSL": true,
-      "RoleArn": "arn:aws:iam::471112624751:role/sts_s3_upload",
-      "AccessKeyId": "AKIAW3MEAFJXWRCGSX5Z",
-      "SecretAccessKey": "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",
-      "BucketName": "ei-med-s3-lili-uat-store",
-      "ViewEndpoint": "https://ei-med-s3-lili-uat-store.s3.amazonaws.com/",
-      "DurationSeconds": 7200
-    }
-  },
-
-  "BasicSystemConfig": {
-
-    "OpenUserComplexPassword": true,
-    "OpenSignDocumentBeforeWork": true,
-
-    "OpenLoginLimit": true,
-    "LoginMaxFailCount": 5,
-
-    "LoginFailLockMinutes": 30,
-    "AutoLoginOutMinutes": 120,
-
-    "OpenLoginMFA": false,
-
-    "ContinuousReadingTimeMin": 120,
-    "ReadingRestTimeMin": 10,
-
-    "IsNeedChangePassWord": true,
-    "ChangePassWordDays": 90,
-    // 模板类型 1 Elevate  2 Extensive
-    "TemplateType": 2
-
-  },
-  "SystemEmailSendConfig": {
-    "Port": 465,
-    "Host": "smtp.qiye.aliyun.com",
-    "FromEmail": "uat@extimaging.com",
-    "FromName": "Uat IRC Imaging System",
-    "AuthorizationCode": "SHzyyl2021",
-    "SiteUrl": "http://irc.uat.extimaging.com/login",
-
-    "SystemShortName": "IRC",
-    "OrganizationName": "Extlmaging",
-    "OrganizationNameCN": "Extlmaging",
-    "CompanyName": "Extensive Imaging",
-    "CompanyNameCN": "上海展影医疗科技有限公司",
-    "CompanyShortName": "Extensive Imaging",
-    "CompanyShortNameCN": "展影医疗",
-    "IsEnv_US": false,
-    "IsOpenErrorNoticeEmail": false,
-    "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
-    "ErrorNoticeEmailList": [ "872297557@qq.com" ]
-  },
-
-  "SystemPacsConfig": {
-    "Port": "11113",
-    "IP": "101.132.253.119"
-  }
-
-}

IRaCIS.Core.API/appsettings.json

@@ -3,7 +3,7 @@
     "SecurityKey": "ShangHaiZhanYing_SecurityKey_SHzyyl@2021",
     "Issuer": "Extimaging",
     "Audience": "EICS",
-    "TokenExpireMinute": "10080"//7天
+    "TokenExpireMinute": "10080" //7天
   },
   "IpRateLimiting": {
     "EnableEndpointRateLimiting": true,