diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj b/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj
index 913392d43..6e664dc21 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj
@@ -47,11 +47,11 @@
-
+
-
+
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
index f33b57034..6a0424298 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
@@ -101,6 +101,7 @@ namespace IRaCIS.Core.Application.Contracts
public class TrialProcessConfig
{
+ public TrialDataStore TrialDataStoreType { get; set; }
public List CriterionIds { get; set; } = new List();
@@ -1084,6 +1085,8 @@ namespace IRaCIS.Core.Application.Contracts
public class TrialConfigDTO : BasicTrialConfig
{
+ public TrialDataStore TrialDataStoreType { get; set; }
+
[Comment("阅片任务产生之前 采集影像")]
public CollectImagesType CollectImagesEnum { get; set; }
diff --git a/IRaCIS.Core.Domain/Image/FileUploadRecord.cs b/IRaCIS.Core.Domain/Image/FileUploadRecord.cs
new file mode 100644
index 000000000..c572166d4
--- /dev/null
+++ b/IRaCIS.Core.Domain/Image/FileUploadRecord.cs
@@ -0,0 +1,83 @@
+namespace IRaCIS.Core.Domain.Models;
+
+[Comment("整个系统,上传记录表")]
+[Table("FileUploadRecord")]
+public class FileUploadRecord : BaseFullAuditEntity
+{
+ #region 导航属性
+ [JsonIgnore]
+ public Trial Trial { get; set; }
+ #endregion
+
+ public Guid? TrialId { get; set; }
+
+ public Guid? SubjectId { get; set; }
+
+ public Guid? SubjectVisitId { get; set; }
+
+
+
+ public string FileName { get; set; }
+
+ public long FileSize { get; set; }
+
+ public string FileType { get; set; }
+
+ public string UploadRegion { get; set; }
+
+ [Comment("上传结束时间")]
+ public DateTime UploadFinishedTime { get; set; }
+
+ [StringLength(1000)]
+ public string Path { get; set; }
+
+ [Comment("文件标识ID")]
+ public string FileMarkId { get; set; }
+
+
+ [Comment("是否需要同步")]
+ public bool? IsNeedSync { get; set; }
+
+
+ [Comment("是否已同步-最后一个任务的状态")]
+ public bool? IsSync { get; set; }
+
+ [Comment("同步结束时间-最后一个任务的时间")]
+ public DateTime? syncFinishedTime { get; set; }
+
+
+ public string IP { get; set; }
+
+}
+
+[Comment("同步任务记录表")]
+[Table("FileUploadRecord")]
+public class UploadFileSyncRecord
+{
+ #region 导航属性
+ [JsonIgnore]
+ public FileUpload FileUpload { get; set; }
+ #endregion
+
+ public Guid FileUploadId { get; set; }
+
+ public jobState JobState { get; set; }
+
+
+ public string Msg { get; set; }
+}
+
+public enum jobState
+{
+ //待启动
+ PENDING= 0,
+ //上传中
+ RUNNING= 1,
+
+ SUCCESS= 2,
+
+ FAILED= 3,
+
+ CANCELLED= 4
+
+}
\ No newline at end of file
diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs
index b72d68ac0..6bc26f04d 100644
--- a/IRaCIS.Core.Domain/Trial/Trial.cs
+++ b/IRaCIS.Core.Domain/Trial/Trial.cs
@@ -41,7 +41,7 @@ public partial class Trial : BaseFullDeleteAuditEntity
public List TrialUserRoleList { get; set; } = new List();
[JsonIgnore]
- public List TrialIdentityUserList { get; set; }
+ public List TrialIdentityUserList { get; set; }
[JsonIgnore]
public List TrialReadingCriterionList { get; set; } = new List();
[JsonIgnore]
@@ -133,7 +133,7 @@ public partial class Trial : BaseFullDeleteAuditEntity
public string AttendedReviewerTypes { get; set; } = string.Empty;
- [StringLength(1000)]
+ [StringLength(2000)]
public string TrialExtraConfigJsonStr { get; set; } = string.Empty;
public bool VisitPlanConfirmed { get; set; }
@@ -259,7 +259,7 @@ public partial class Trial : BaseFullDeleteAuditEntity
/// 图像格式
///
[StringLength(2000)]
- public List ImageFormatList { get; set; } = new List() {"jpg","jpeg","png","bmp","pdf","zip","mp4" };
+ public List ImageFormatList { get; set; } = new List() { "jpg", "jpeg", "png", "bmp", "pdf", "zip", "mp4" };
#endregion
#region 邮件配置
@@ -316,6 +316,15 @@ public partial class Trial : BaseFullDeleteAuditEntity
///
public bool? IsImageQualityControl { get; set; }
+ public TrialDataStore TrialDataStoreType { get; set; }
+
+}
+
+public enum TrialDataStore
+{
+ SingleCenter = 0,
+
+ MUtiCenter = 1,
}
public enum CollectImagesType