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

IRaCIS.Core.Application/Helper/OSSService.cs

@@ -39,6 +39,9 @@ namespace IRaCIS.Core.Application.Helper
         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; }
 
@@ -144,7 +147,7 @@ namespace IRaCIS.Core.Application.Helper
                 {
                     var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
 
-                    var _ossClient = new OssClient(aliConfig.endPoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
+                    var _ossClient = new OssClient(aliConfig.internalEndpoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
 
 
 
@@ -220,7 +223,7 @@ namespace IRaCIS.Core.Application.Helper
             {
                 var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
 
-                var _ossClient = new OssClient(aliConfig.endPoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
+                var _ossClient = new OssClient(aliConfig.internalEndpoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
 
                 // 上传文件
                 var result = _ossClient.PutObject(aliConfig.bucketName, ossRelativePath, localFilePath);
@@ -279,7 +282,7 @@ namespace IRaCIS.Core.Application.Helper
                 {
                     var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
 
-                    var _ossClient = new OssClient(aliConfig.endPoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
+                    var _ossClient = new OssClient(aliConfig.internalEndpoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
 
                     // 上传文件
                     var result = _ossClient.GetObject(aliConfig.bucketName, ossRelativePath);
@@ -351,7 +354,7 @@ namespace IRaCIS.Core.Application.Helper
                 {
                     var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
 
-                    var _ossClient = new OssClient(aliConfig.endPoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
+                    var _ossClient = new OssClient(aliConfig.internalEndpoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
 
                     // 生成签名URL。
                     var req = new GeneratePresignedUriRequest(aliConfig.bucketName, ossRelativePath, SignHttpMethod.Get)

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -5641,6 +5641,11 @@
             单位
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingReportDto.HighlightAnswer">
+            <summary>
+            高亮问题的答案
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingReportDto.GroupEnName">
             <summary>
             问题英文分组
@@ -8632,6 +8637,11 @@
             关联Value
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.HighlightAnswer">
+            <summary>
+            高亮问题的答案
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.Type">
             <summary>
             类型
@@ -8732,6 +8742,11 @@
             Id
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.HighlightAnswer">
+            <summary>
+            高亮问题的答案
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.ClassifyAlgorithms">
             <summary>
             分类算法

IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs

@@ -19,6 +19,7 @@ using System.IO.Compression;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Web;
 
 namespace IRaCIS.Core.Application.Service.ImageAndDoc
 {
@@ -491,6 +492,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
         public async Task<IResponseOutput> RequestPackageAndAnonymizImage(Guid trialId, Guid subjectVisitId, bool isDicom, bool isAnonymize = true)
         {
+
+
             var extralConfig = _repository.Where<Trial>(t => t.Id == trialId).Select(t => t.TrialExtraConfigJsonStr).FirstOrDefault() ?? string.Empty;
 
             var config = JsonConvert.DeserializeObject<TrialExtraConfig>(extralConfig) ?? new TrialExtraConfig();
@@ -762,9 +765,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                                 foreach (var file in noneDicomStudy.FileList)
                                 {
                                     string destinationPath = Path.Combine(studyNoneDicomFolderPath, Path.GetFileName(file.FileName));
-
+                                
                                     //下载到当前目录
-                                    await _oSSService.DownLoadFromOSSAsync(file.Path, destinationPath);
+                                    await _oSSService.DownLoadFromOSSAsync(HttpUtility.UrlDecode(file.Path) , destinationPath);
                                 }
                             }
 

IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs

@@ -422,6 +422,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                      VisitNum = t.SubjectVisit.VisitNum,
 
                      IsDicom = false,
+                     IsFromPACS=false,
 
                      SubjectCode = t.Subject.Code,
 

IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs

@@ -1052,7 +1052,7 @@ namespace IRaCIS.Application.Contracts
         public string CallingAE { get; set; } = string.Empty;
 
         public string BodyPartExamined { get; set; } = string.Empty;
-
+        public string AccessionNumber { get; set; } = string.Empty;
         public string PatientIdStr { get; set; } = string.Empty;
         public string PatientName { get; set; } = string.Empty;
         public string PatientAge { get; set; } = string.Empty;

IRaCIS.Core.Application/Service/Visit/PatientService.cs

@@ -266,6 +266,7 @@ namespace IRaCIS.Application.Services
                             SeriesCount = scpStudy.SeriesCount,
                             StudyTime = scpStudy.StudyTime,
                             BodyPartExamined=scpStudy.BodyPartExamined,
+                            AccessionNumber=scpStudy.AccessionNumber,
 
                             PatientBirthDate=scpStudy.PatientBirthDate,
                             PatientAge = scpStudy.PatientAge,

IRaCIS.Core.Application/Service/Visit/_MapConfig.cs

@@ -119,7 +119,13 @@ namespace IRaCIS.Core.Application.Service
                   .ForMember(d => d.TrialSiteAliasName, u => u.MapFrom(s => s.TrialSite.TrialSiteAliasName))
                    .ForMember(d => d.TrialSiteName, u => u.MapFrom(s => s.TrialSite.TrialSiteName))
 ;
-            
+
+
+            CreateMap<SCPStudy, DicomStudy>();
+            CreateMap<SCPSeries, DicomSeries>();
+            CreateMap<SCPInstance, DicomInstance>();
+
+
         }
     }