Merge branch 'Test_IRC_Net8' into Uat_IRC_Net8

IRC.Core.SCP/appsettings.Prod_IRC_SCP.json

@@ -8,6 +8,26 @@
   },
   "ObjectStoreService": {
     "ObjectStoreUse": "AliyunOSS",
+    "IsOpenStoreSync": true,
+    "ApiDeployRegion": "CN",
+    "SyncConfigList": [
+      {
+        "Domain": "irc.extimaging.com",
+        "Primary": "AliyunOSS",
+        "Target": "AWS",
+        "UploadRegion": "CN",
+        "TargetRegion": "US",
+        "IsOpenSync": true
+      },
+      {
+        "Domain": "eiirc.extimaging.com",
+        "Primary": "AWS",
+        "Target": "AliyunOSS",
+        "UploadRegion": "US",
+        "TargetRegion": "CN",
+        "IsOpenSync": true
+      }
+    ],
     "AliyunOSS": {
       "RegionId": "cn-shanghai",
       "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
@@ -19,6 +39,18 @@
       "ViewEndpoint": "https://zy-irc-cache.oss-cn-shanghai.aliyuncs.com",
       "Region": "oss-cn-shanghai",
       "DurationSeconds": 7200
+    },
+
+    "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-irc-store",
+      "ViewEndpoint": "https://ei-med-s3-irc-store.s3.amazonaws.com",
+      "DurationSeconds": 7200
     }
   },
 

IRC.Core.SCP/appsettings.US_Prod_SCP.json

@@ -8,6 +8,38 @@
   },
   "ObjectStoreService": {
     "ObjectStoreUse": "AWS",
+    "IsOpenStoreSync": true,
+    "ApiDeployRegion": "US",
+    "SyncConfigList": [
+      {
+        "Domain": "eilili.elevateimaging.ai",
+        "Primary": "AliyunOSS",
+        "Target": "AWS",
+        "UploadRegion": "CN",
+        "TargetRegion": "US",
+        "IsOpenSync": true
+      },
+      {
+        "Domain": "lili.elevateimaging.ai",
+        "Primary": "AWS",
+        "Target": "AliyunOSS",
+        "UploadRegion": "US",
+        "TargetRegion": "CN",
+        "IsOpenSync": true
+      }
+    ],
+    "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-lili-store",
+      "ViewEndpoint": "https://zy-lili-cache.oss-cn-shanghai.aliyuncs.com",
+      "Region": "oss-cn-shanghai",
+      "DurationSeconds": 7200
+    },
     "AWS": {
       "Region": "us-east-1",
       "EndPoint": "s3.us-east-1.amazonaws.com",

IRaCIS.Core.API/appsettings.Prod_IRC.json

@@ -20,6 +20,26 @@
   },
   "ObjectStoreService": {
     "ObjectStoreUse": "AliyunOSS",
+    "IsOpenStoreSync": true,
+    "ApiDeployRegion": "CN",
+    "SyncConfigList": [
+      {
+        "Domain": "irc.extimaging.com",
+        "Primary": "AliyunOSS",
+        "Target": "AWS",
+        "UploadRegion": "CN",
+        "TargetRegion": "US",
+        "IsOpenSync": true
+      },
+      {
+        "Domain": "eiirc.extimaging.com",
+        "Primary": "AWS",
+        "Target": "AliyunOSS",
+        "UploadRegion": "US",
+        "TargetRegion": "CN",
+        "IsOpenSync": true
+      }
+    ],
     "AliyunOSS": {
       "RegionId": "cn-shanghai",
       "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
@@ -32,13 +52,16 @@
       "Region": "oss-cn-shanghai",
       "DurationSeconds": 7200
     },
-    "MinIO": {
+    "AWS": {
-      "endpoint": "http://192.168.3.68",
+      "Region": "us-east-1",
-      "port": "8001",
+      "EndPoint": "s3.us-east-1.amazonaws.com",
-      "useSSL": false,
+      "UseSSL": true,
-      "accessKey": "IDFkwEpWej0b4DtiuThL",
+      "RoleArn": "arn:aws:iam::471112624751:role/lili_s3_access",
-      "secretKey": "Lhuu83yMhVwu7c1SnjvGY6lq74jzpYqifK6Qtj4h",
+      "AccessKeyId": "AKIAW3MEAFJXZ2TZK7GM",
-      "bucketName": "test"
+      "SecretAccessKey": "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",
+      "BucketName": "ei-med-s3-irc-store",
+      "ViewEndpoint": "https://ei-med-s3-irc-store.s3.amazonaws.com",
+      "DurationSeconds": 7200
     }
   },
   "BasicSystemConfig": {

IRaCIS.Core.API/appsettings.US_Prod_IRC.json

@@ -20,16 +20,38 @@
   },
   "ObjectStoreService": {
     "ObjectStoreUse": "AWS",
-    "MinIO": {
+    "IsOpenStoreSync": true,
-      "endPoint": "44.210.231.169",
+    "ApiDeployRegion": "US",
-      "port": "9001",
+    "SyncConfigList": [
-      "useSSL": false,
+      {
-      "accessKey": "e9bT1isTOqSAUxb6wd4n",
+        "Domain": "eilili.elevateimaging.ai",
-      "secretKey": "b5TaDzNdQCBtCvfm8eZ3dR6yY7tfZu2JYze2Po1i",
+        "Primary": "AliyunOSS",
-      "bucketName": "prod-irc-us",
+        "Target": "AWS",
-      "viewEndpoint": "http://44.210.231.169:9001/prod-irc-us/"
+        "UploadRegion": "CN",
+        "TargetRegion": "US",
+        "IsOpenSync": true
+      },
+      {
+        "Domain": "lili.elevateimaging.ai",
+        "Primary": "AWS",
+        "Target": "AliyunOSS",
+        "UploadRegion": "US",
+        "TargetRegion": "CN",
+        "IsOpenSync": true
+      }
+    ],
+    "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-lili-store",
+      "ViewEndpoint": "https://zy-lili-cache.oss-cn-shanghai.aliyuncs.com",
+      "Region": "oss-cn-shanghai",
+      "DurationSeconds": 7200
     },
-
     "AWS": {
       "Region": "us-east-1",
       "EndPoint": "s3.us-east-1.amazonaws.com",

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs

@@ -98,6 +98,12 @@ namespace IRaCIS.Core.Application.Contracts
         public bool IsOpenLostVistRead { get; set; } = true;
 
 
+        /// <summary>
+        /// 影像质控风险控制
+        /// </summary>
+        public bool? IsImageQualityControl { get; set; }
+
+
     }
 
     public class ConfigTrialProcessInfoVerificationInDto
@@ -119,11 +125,6 @@ namespace IRaCIS.Core.Application.Contracts
         public List<Guid> TrialCriterionIds { get; set; } = new List<Guid>();
 
 
-        /// <summary>
-        /// 影像质控风险控制
-        /// </summary>
-        public bool? IsImageQualityControl { get; set; }
-
         public Guid TrialId { get; set; }
 
         /// <summary>

IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs

@@ -222,7 +222,9 @@ namespace IRaCIS.Core.Application.Service
                 //var test = _trialRepository.Where(t => t.CreateTime.Year == DateTime.Now.Year + 1).Select(t => t.Code).DefaultIfEmpty(1).ToList();
 
                 var trial = _mapper.Map<Trial>(trialAddModel);
+
                 //trial.Id = NewId.NextGuid();
+
                 var yearStr = DateTime.Now.Year.ToString();
 
                 trial.Code = currentYearMaxCodeNext;

IRaCIS.Core.Domain/Trial/Trial.cs

@@ -307,14 +307,14 @@ public partial class Trial : BaseFullDeleteAuditEntity
     /// <summary>
     /// IQC自动下一个任务
     /// </summary>
-    public bool IsIQCAutoNextTask { get; set; }
+    public bool IsIQCAutoNextTask { get; set; } = true;
 
-    public bool IsIQCAutoTaskDistinguishType { get; set; }
+    public bool IsIQCAutoTaskDistinguishType { get; set; } = true;
 
     /// <summary>
     /// 影像质控风险控制
     /// </summary>
-    public bool? IsImageQualityControl { get; set; }
+    public bool? IsImageQualityControl { get; set; } = true;
 
     public TrialDataStore TrialDataStoreType { get; set; }
 
@@ -327,7 +327,7 @@ public partial class Trial : BaseFullDeleteAuditEntity
     /// <summary>
     /// QC质控下载
     /// </summary>
-    public bool IsSupportQCDownloadImage { get; set; } = false;
+    public bool IsSupportQCDownloadImage { get; set; }
 
     /// <summary>
     /// 打开失访可读