Merge branch 'Test.IRC' of http://192.168.3.69:2000/XCKJ/irc-netcore-api into Test.IRC

2023-10-24 17:27:36 +08:00
parent 4b9ca6ca25 f4a502024d
commit c7b32fd29a
9 changed files with 201 additions and 80 deletions
@@ -51,17 +51,19 @@ namespace IRaCIS.Core.Application.Helper
        {
            var ossOptions = options.CurrentValue;

-            _OSSConfig = new AliyunOssOptions()
-            {
-                RegionId = ossOptions.RegionId,
-                AccessKeyId = ossOptions.AccessKeyId,
-                AccessKeySecret = ossOptions.AccessKeySecret,
-                EndPoint = ossOptions.EndPoint,
-                BucketName = ossOptions.BucketName,
-                RoleArn = ossOptions.RoleArn,
-                Region = ossOptions.Region,
-                ViewEndpoint = ossOptions.ViewEndpoint
-            };
+            _OSSConfig= ossOptions;
+
+            //_OSSConfig = new AliyunOssOptions()
+            //{
+            //    RegionId = ossOptions.RegionId,
+            //    AccessKeyId = ossOptions.AccessKeyId,
+            //    AccessKeySecret = ossOptions.AccessKeySecret,
+            //    EndPoint = ossOptions.EndPoint,
+            //    BucketName = ossOptions.BucketName,
+            //    RoleArn = ossOptions.RoleArn,
+            //    Region = ossOptions.Region,
+            //    ViewEndpoint = ossOptions.ViewEndpoint
+            //};

            _ossClient = new OssClient(_OSSConfig.EndPoint, _OSSConfig.AccessKeyId, _OSSConfig.AccessKeySecret);

@@ -1954,6 +1954,13 @@
            <param name="inDto"></param>
            <returns></returns>
        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.GetEvidenceFocalFDG(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
+            <summary>
+            骨髓中是否存在局灶性 FDG亲和病灶的证据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.GetLiverAssessment(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
            <summary>
            获取肝脏评估
@@ -98,7 +98,8 @@ namespace IRaCIS.Application.Services
        /// <returns></returns>
        public async Task<string> CreateDoctorsAllAttachmentZip(Guid[] doctorIds)
        {
-            //准备下载文件的临时路径
+            #region 老版本 存储在服务器
+              //准备下载文件的临时路径
            var guidStr = Guid.NewGuid().ToString();
            //string uploadFolderPath = HostingEnvironment.MapPath("/UploadFile/");
            string uploadFolderPath = Path.Combine(FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment), "UploadFile");
@@ -134,6 +135,8 @@ namespace IRaCIS.Application.Services
            string targetPath = Path.Combine(uploadFolderPath, target + ".zip");
            ZipHelper.CreateZip(tempSavePath, targetPath);
            return Path.Combine("/IRaCISData/UploadFile/", target + ".zip");
+            #endregion
+         
        }


@@ -52,7 +52,9 @@ namespace IRaCIS.Core.Application.Service

            CreateMap<TrialUser, TrialDocumentUserConfirmView>();

+            CreateMap<BatchAddTrialEmailNoticeConfig, TrialEmailNoticeConfig>();

+            


            CreateMap<AddOrEditTrialDocument, TrialDocument>()
@@ -119,6 +119,8 @@ namespace IRaCIS.Core.Application.Service.Third_partyProject.DTO

    public class InstancePathDTO
    {
+        public string StudyInstanceUid { get; set; }
+        public string SopInstanceUid { get; set; }
        public string StudyCode { get; set; }
        public string InstancePath { get; set; }
    }
@@ -194,7 +194,7 @@ namespace IRaCIS.Core.Application.Service.Third_partyProject
        [HttpPost]
        public async Task<List<InstancePathDTO>> GetStudyModalityOSSPath(List<Guid> seriesIdList, [FromServices] IRepository<DicomSeries> _dicomSeriesRepository)
        {
-            return await _dicomSeriesRepository.Where(t => seriesIdList.Contains(t.Id)).SelectMany(t => t.DicomInstanceList).Select(t => new InstancePathDTO() {InstancePath= t.Path,StudyCode=t.DicomStudy.StudyCode } ).ToListAsync();
+            return await _dicomSeriesRepository.Where(t => seriesIdList.Contains(t.Id)).SelectMany(t => t.DicomInstanceList).Select(t => new InstancePathDTO() {InstancePath= t.Path,StudyCode=t.DicomStudy.StudyCode , SopInstanceUid = t.SopInstanceUid, StudyInstanceUid = t.StudyInstanceUid} ).ToListAsync();
        }