修改dicom 获取tag值 patientId为空

2024-08-01 10:12:09 +08:00
parent 9fa24a35ef
commit e3ee1a42fb
7 changed files with 132 additions and 65 deletions
@@ -1,11 +1,9 @@
 using Aliyun.OSS;
-using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Infrastructure;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 using Minio.DataModel.Args;
 using Minio;
-using NPOI.HPSF;
 using SharpCompress.Common;
 using System;
 using System.Collections.Generic;
@@ -15,6 +13,7 @@ using System.Linq;
 using System.Security.AccessControl;
 using System.Text;
 using System.Threading.Tasks;
+using System.Runtime.InteropServices;

 namespace IRaCIS.Core.Application.Helper
 {
@@ -134,66 +133,76 @@ namespace IRaCIS.Core.Application.Helper
            //var ossRelativePath = $"{oosFolderPath}/{Guid.NewGuid()}_{fileRealName}";
            //var ossRelativePath = oosFolderPath + "/" + fileRealName;

-            using (var memoryStream = new MemoryStream())
+            try
            {
-                fileStream.Seek(0, SeekOrigin.Begin);
-
-                fileStream.CopyTo(memoryStream);
-
-                memoryStream.Seek(0, SeekOrigin.Begin);
-
-
-                if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
+                using (var memoryStream = new MemoryStream())
                {
-                    var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
+                    fileStream.Seek(0, SeekOrigin.Begin);

-                    var _ossClient = new OssClient(aliConfig.internalEndpoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
+                    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, aliConfig.accessKeyId, aliConfig.accessKeySecret);



-                    // 上传文件
-                    var result = _ossClient.PutObject(aliConfig.bucketName, ossRelativePath, memoryStream);
+                        // 上传文件
+                        var result = _ossClient.PutObject(aliConfig.bucketName, ossRelativePath, memoryStream);

-                }
-                else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
-                {
-                    var minIOConfig = ObjectStoreServiceOptions.MinIO;
+                    }
+                    else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
+                    {
+                        var minIOConfig = ObjectStoreServiceOptions.MinIO;


-                    var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.endPoint}:{minIOConfig.port}")
-                        .WithCredentials(minIOConfig.accessKey, minIOConfig.secretKey).WithSSL(minIOConfig.useSSL)
-                        .Build();
+                        var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.endPoint}:{minIOConfig.port}")
+                            .WithCredentials(minIOConfig.accessKey, minIOConfig.secretKey).WithSSL(minIOConfig.useSSL)
+                            .Build();

-                    var putObjectArgs = new PutObjectArgs()
-                           .WithBucket(minIOConfig.bucketName)
-                           .WithObject(ossRelativePath)
-                           .WithStreamData(memoryStream)
-                           .WithObjectSize(memoryStream.Length);
+                        var putObjectArgs = new PutObjectArgs()
+                               .WithBucket(minIOConfig.bucketName)
+                               .WithObject(ossRelativePath)
+                               .WithStreamData(memoryStream)
+                               .WithObjectSize(memoryStream.Length);

-                    await minioClient.PutObjectAsync(putObjectArgs);
-                }
-                else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
-                {
-                    var minIOConfig = ObjectStoreServiceOptions.AWS;
+                        await minioClient.PutObjectAsync(putObjectArgs);
+                    }
+                    else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
+                    {
+                        var minIOConfig = ObjectStoreServiceOptions.AWS;


-                    var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.endPoint}")
-                        .WithCredentials(minIOConfig.accessKey, minIOConfig.secretKey).WithSSL(minIOConfig.useSSL)
-                        .Build();
+                        var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.endPoint}")
+                            .WithCredentials(minIOConfig.accessKey, minIOConfig.secretKey).WithSSL(minIOConfig.useSSL)
+                            .Build();

-                    var putObjectArgs = new PutObjectArgs()
-                           .WithBucket(minIOConfig.bucketName)
-                           .WithObject(ossRelativePath)
-                           .WithStreamData(memoryStream)
-                           .WithObjectSize(memoryStream.Length);
+                        var putObjectArgs = new PutObjectArgs()
+                               .WithBucket(minIOConfig.bucketName)
+                               .WithObject(ossRelativePath)
+                               .WithStreamData(memoryStream)
+                               .WithObjectSize(memoryStream.Length);

-                    await minioClient.PutObjectAsync(putObjectArgs);
-                }
-                else
-                {
-                    throw new BusinessValidationFailedException("未定义的存储介质类型");
+                        await minioClient.PutObjectAsync(putObjectArgs);
+                    }
+                    else
+                    {
+                        throw new BusinessValidationFailedException("未定义的存储介质类型");
+                    }
                }
            }
+            catch (Exception ex)
+            {
+
+                throw new BusinessValidationFailedException($"上传发生异常：{ex.Message}");
+            }
+
+


            return "/" + ossRelativePath;
@@ -223,7 +232,7 @@ namespace IRaCIS.Core.Application.Helper
            {
                var aliConfig = ObjectStoreServiceOptions.AliyunOSS;

-                var _ossClient = new OssClient(aliConfig.internalEndpoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
+                var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows)? aliConfig.endPoint: aliConfig.internalEndpoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);

                // 上传文件
                var result = _ossClient.PutObject(aliConfig.bucketName, ossRelativePath, localFilePath);
@@ -282,7 +291,7 @@ namespace IRaCIS.Core.Application.Helper
                {
                    var aliConfig = ObjectStoreServiceOptions.AliyunOSS;

-                    var _ossClient = new OssClient(aliConfig.internalEndpoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
+                    var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.endPoint : aliConfig.internalEndpoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);

                    // 上传文件
                    var result = _ossClient.GetObject(aliConfig.bucketName, ossRelativePath);
@@ -354,7 +363,7 @@ namespace IRaCIS.Core.Application.Helper
                {
                    var aliConfig = ObjectStoreServiceOptions.AliyunOSS;

-                    var _ossClient = new OssClient(aliConfig.internalEndpoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
+                    var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.endPoint : aliConfig.internalEndpoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);

                    // 生成签名URL。
                    var req = new GeneratePresignedUriRequest(aliConfig.bucketName, ossRelativePath, SignHttpMethod.Get)
@@ -1293,6 +1293,18 @@
        <member name="M:IRaCIS.Core.Application.Service.SystemNoticeService.GetUserSystemNoticeList(IRaCIS.Core.Application.ViewModel.SystemNoticeQuery)">
            <summary>获取登陆用户的系统通知列表  只是过滤了用户类型 和已经发布的</summary>
        </member>
+        <member name="T:IRaCIS.Core.Application.Service.UserFeedBackService">
+            <summary>
+            UserFeedBackService
+            </summary>	
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.UserFeedBackService.BatchUpdateFeedBackState(IRaCIS.Core.Application.ViewModel.BatchUpdateCommand)">
+            <summary>
+            批量更新状态
+            </summary>
+            <param name="batchUpdateCommand"></param>
+            <returns></returns>
+        </member>
        <member name="M:IRaCIS.Core.Application.Service.QCCommon.VerifyIsCRCSubmmitAsync(IRaCIS.Core.Infra.EFCore.IRepository,IRaCIS.Core.Domain.Share.IUserInfo,System.Nullable{System.Guid})">
            <summary>
            验证CRC 是否已提交 已提交 就不允许进行任何操作，如果是IQC 那么还验证是否是当前任务领取人
@@ -10244,6 +10256,15 @@
        <member name="T:IRaCIS.Core.Application.ViewModel.SystemNoticeAddOrEdit">
            <summary> SystemNoticeAddOrEdit  列表查询参数模型</summary>
        </member>
+        <member name="T:IRaCIS.Core.Application.ViewModel.UserFeedBackView">
+            <summary> UserFeedBackView  列表视图模型 </summary>
+        </member>
+        <member name="T:IRaCIS.Core.Application.ViewModel.UserFeedBackQuery">
+            <summary>UserFeedBackQuery  列表查询参数模型</summary>
+        </member>
+        <member name="T:IRaCIS.Core.Application.ViewModel.UserFeedBackAddOrEdit">
+            <summary> UserFeedBackAddOrEdit  列表查询参数模型</summary>
+        </member>
        <member name="T:IRaCIS.Core.Application.ViewModel.UserLogView">
            <summary> UserLogView  列表视图模型 </summary>
        </member>
@@ -11101,6 +11122,11 @@
            ISystemNoticeService
            </summary>	
        </member>
+        <member name="T:IRaCIS.Core.Application.Interfaces.IUserFeedBackService">
+            <summary>
+            IUserFeedBackService
+            </summary>	
+        </member>
        <member name="T:IRaCIS.Core.Application.Interfaces.IUserLogService">
            <summary>
            IUserLogService
@@ -14075,6 +14101,13 @@
            影像阅片临床数据签名
            </summary>
        </member>
+        <member name="M:IRaCIS.Application.Services.ReadingClinicalDataService.DealVisiTaskClinicalDataSignedAsync(System.Guid,System.Guid,System.Guid,System.Boolean,System.Guid)">
+            <summary>
+            一致性分析的临床数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
        <member name="M:IRaCIS.Application.Services.ReadingClinicalDataService.GetTrialClinicalDataSelect(IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataSelectIndto)">
            <summary>
            获取下拉菜单
@@ -14096,6 +14129,13 @@
            <param name="inDto"></param>
            <returns></returns>
        </member>
+        <member name="M:IRaCIS.Application.Services.ReadingClinicalDataService.GetConsistencyAnalysisReadingClinicalDataList(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingClinicalDataListIndto)">
+            <summary>
+            获取阅片临床数据列表
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
        <member name="M:IRaCIS.Application.Services.ReadingClinicalDataService.GetReadingClinicalDataPDFList(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingClinicalDataPDFListIndto)">
            <summary>
            获取单个阅片临床数据的所有文件