修改一版

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

@@ -427,21 +427,11 @@
             <returns></returns>
             <exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
         </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataQuery.ExpirationVisit">
-            <summary>
-            截止访视
-            </summary>
-        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataQuery.TrialId">
             <summary>
             项目ID
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataQuery.ReadingPeriodName">
-            <summary>
-            阅片期名称
-            </summary>
-        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataQuery.PageIndex">
             <summary>
             页码
@@ -2555,25 +2545,30 @@
             <param name="password"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Application.Services.ClinicalDataService.AddOrUpdateClinicalDataService(IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetAddOrEdit)">
+        <member name="T:IRaCIS.Application.Services.ClinicalDataService">
+            <summary>
+            临床数据
+            </summary>
+        </member>
+        <member name="M:IRaCIS.Application.Services.ClinicalDataService.AddOrUpdateClinicalDataService(IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataAddOrEdit)">
             <summary>
             新增或者修改
             </summary>
-            <param name="addOrEditReadingPeriodSet"></param>
+            <param name="addOrEditClinicalData"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Application.Services.ClinicalDataService.GetReadingPeriodSetList(IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetQuery)">
+        <member name="M:IRaCIS.Application.Services.ClinicalDataService.GetClinicalDataList(IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataQuery)">
             <summary>
             分页获取
             </summary>
             <param name="query"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Application.Services.ClinicalDataService.DeleteReadingPeriodSet(System.Guid)">
+        <member name="M:IRaCIS.Application.Services.ClinicalDataService.DeleteClinicalData(System.Guid)">
             <summary>
             删除
             </summary>
-            <param name="readingPeriodSetId"></param>
+            <param name="ClinicalDataId"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Application.Services.ReadingPeriodSetService.AddOrUpdateReadingPeriodSet(IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetAddOrEdit)">

IRaCIS.Core.Application/Service/Reading/ClinicalDataService.cs

@@ -11,6 +11,9 @@ using IRaCIS.Core.Domain.Share.Reading;
 
 namespace IRaCIS.Application.Services
 {
+    /// <summary>
+    /// 临床数据
+    /// </summary>
     [ApiExplorerSettings(GroupName = "Reading")]
     public class ClinicalDataService : BaseService
     {

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

@@ -15,6 +15,10 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<ReadingPeriodSet, ReadingPeriodSetView>();
 
+            CreateMap<ClinicalData, ClinicalDataAddOrEdit>().ReverseMap();
+
+            CreateMap<ClinicalData, ClinicalDataView>();
+
         }
     }
    

IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs

@@ -107,4 +107,64 @@ namespace IRaCIS.Core.Domain.Share.Reading
         ReadComplete = 4,
 
     }
+
+
+    /// <summary>
+	/// 上传方式
+	/// </summary>
+	public enum ClinicalUploadType
+    {
+        /// <summary>
+        /// 表格
+        /// </summary>
+        Table = 0,
+
+        /// <summary>
+        /// PDF
+        /// </summary>
+        PDF = 1,
+
+    }
+
+    /// <summary>
+    /// 数据类型
+    /// </summary>
+    public enum ClinicalDataType
+    {
+        /// <summary>
+        /// 既往局部治疗史
+        /// </summary>
+        MedicalHistory = 0,
+
+        /// <summary>
+        /// 影像模态（PET临床信息）
+        /// </summary>
+        PET = 1,
+
+        /// <summary>
+        /// 胸水
+        /// </summary>
+        Hydrothorax = 2,
+    }
+
+    /// <summary>
+    /// 临床分组类型
+    /// </summary>
+    public enum ClinicalScopeType
+    {
+        /// <summary>
+        /// 受试者
+        /// </summary>
+        Subject = 0,
+
+        /// <summary>
+        /// 访视
+        /// </summary>
+        Visit = 1,
+
+        /// <summary>
+        /// 阅片
+        /// </summary>
+        Read = 2,
+    }
 }

IRaCIS.Core.Domain/Reading/ClinicalData.cs

@@ -31,19 +31,19 @@ namespace IRaCIS.Core.Domain.Models
 		public Guid? VisitOrReadId { get; set; }
 
 		/// <summary>
-		/// 分组类型
+		/// 分组类型(受试者)
 		/// </summary>
-		public int? ScopeType { get; set; }
+		public ClinicalScopeType? ScopeType { get; set; }
 
 		/// <summary>
 		/// 数据类型
 		/// </summary>
-		public int? DataType { get; set; }
+		public ClinicalDataType? DataType { get; set; }
 
 		/// <summary>
-		/// 上传方式
+		/// 上传方式()
 		/// </summary>
-		public int? UploadType { get; set; }
+		public ClinicalUploadType? UploadType { get; set; }
 
 		/// <summary>
 		/// 创建时间
@@ -58,5 +58,8 @@ namespace IRaCIS.Core.Domain.Models
 	}
 
 
+	
+
+
 
 }