diff --git a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
index 1bf3eb368..1e6a9af25 100644
--- a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
+++ b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
@@ -397,8 +397,10 @@ namespace IRaCIS.Core.API.Controllers
}
+
+
///
- /// 上传临床数据
+ /// 上传临床数据(废弃)
///
///
///
diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml
index 77526e2d4..5e29e14bc 100644
--- a/IRaCIS.Core.API/IRaCIS.Core.API.xml
+++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml
@@ -173,7 +173,7 @@
- 上传临床数据
+ 上传临床数据(废弃)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 07aa41df8..ff93c8901 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -950,6 +950,11 @@
项目ID
+
+
+ 受试者ID
+
+
对象ID
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs
index 8d07e5e4b..d9bc0aa7c 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs
@@ -79,10 +79,7 @@ namespace IRaCIS.Application.Services
Id = x.Id
}).ToListAsync() ;
-
return clinicalList;
-
-
}
///
diff --git a/IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs b/IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs
index d358267de..8195efed0 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs
@@ -5,6 +5,7 @@ using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using IRaCIS.Core.Domain.Share.Reading;
+using System.Collections.Generic;
namespace IRaCIS.Core.Domain.Models
{
@@ -54,6 +55,12 @@ namespace IRaCIS.Core.Domain.Models
public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; }
+ ///
+ /// PDF文件
+ ///
+ public List ReadingClinicalDataPDFList { get; set; }
+
+
}
diff --git a/IRaCIS.Core.Domain/Reading/ReadingClinicalDataPDF.cs b/IRaCIS.Core.Domain/Reading/ReadingClinicalDataPDF.cs
new file mode 100644
index 000000000..6ced553ae
--- /dev/null
+++ b/IRaCIS.Core.Domain/Reading/ReadingClinicalDataPDF.cs
@@ -0,0 +1,67 @@
+
+
+using System;
+using IRaCIS.Core.Domain.Share;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using IRaCIS.Core.Domain.Share.Reading;
+
+namespace IRaCIS.Core.Domain.Models
+{
+ ///
+ /// 项目的临床数据
+ ///
+ [Table("ReadingClinicalDataPDF")]
+ public class ReadingClinicalDataPDF : Entity, IAuditAdd
+ {
+ ///
+ /// 项目ID
+ ///
+ public Guid TrialId { get; set; }
+
+ ///
+ /// 对象ID
+ ///
+ public Guid ObjectId { get; set; }
+
+ ///
+ /// 受试者ID
+ ///
+ public Guid SubjectId { get; set; }
+
+ ///
+ /// 阅片临床数据ID
+ ///
+ public Guid ReadingClinicalDataId { get; set; }
+
+ ///
+ /// 是否为访视
+ ///
+ public bool IsVisit { get; set; }
+
+ ///
+ /// 临床级别
+ ///
+ public ClinicalLevel ClinicalDataLevel { get; set; }
+
+ ///
+ /// 创建时间
+ ///
+ public DateTime CreateTime { get; set; }
+
+ ///
+ /// 创建人
+ ///
+ public Guid CreateUserId { get; set; }
+
+ [ForeignKey("ReadingClinicalDataId")]
+
+ public ReadingClinicalData ReadingClinicalData { get; set; }
+ }
+
+
+
+
+
+
+}
diff --git a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
index 7f8dd68ac..4f2064589 100644
--- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
+++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
@@ -182,7 +182,10 @@ namespace IRaCIS.Core.Infra.EFCore
public virtual DbSet ReadingClinicalData { get; set; }
+ public virtual DbSet ReadingClinicalDataPDF { get; set; }
+
public virtual DbSet ReadModule { get; set; }
+
public virtual DbSet ReadModuleView { get; set; }
public virtual DbSet ClinicalDataTrialSet { get; set; }