From 80bc6025034b0e7e5e9c30178b6aa2aa8edce292 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 30 May 2022 17:54:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IRaCIS.Core.Application.xml | 25 ++++----
.../Service/Reading/ClinicalDataService.cs | 3 +
.../Service/Reading/_MapConfig.cs | 4 ++
IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs | 60 +++++++++++++++++++
IRaCIS.Core.Domain/Reading/ClinicalData.cs | 13 ++--
5 files changed, 85 insertions(+), 20 deletions(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 567a0b076..ec7381d79 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -427,21 +427,11 @@
-
-
- 截止访视
-
-
项目ID
-
-
- 阅片期名称
-
-
页码
@@ -2555,25 +2545,30 @@
-
+
+
+ 临床数据
+
+
+
新增或者修改
-
+
-
+
分页获取
-
+
删除
-
+
diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalDataService.cs
index 9f10fcf8d..877182e0e 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalDataService.cs
@@ -11,6 +11,9 @@ using IRaCIS.Core.Domain.Share.Reading;
namespace IRaCIS.Application.Services
{
+ ///
+ /// 临床数据
+ ///
[ApiExplorerSettings(GroupName = "Reading")]
public class ClinicalDataService : BaseService
{
diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
index 1c08e1152..166742a9c 100644
--- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
@@ -15,6 +15,10 @@ namespace IRaCIS.Core.Application.Service
CreateMap();
+ CreateMap().ReverseMap();
+
+ CreateMap();
+
}
}
diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
index 26bc3c58d..e74ca96d3 100644
--- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
+++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
@@ -107,4 +107,64 @@ namespace IRaCIS.Core.Domain.Share.Reading
ReadComplete = 4,
}
+
+
+ ///
+ /// 上传方式
+ ///
+ public enum ClinicalUploadType
+ {
+ ///
+ /// 表格
+ ///
+ Table = 0,
+
+ ///
+ /// PDF
+ ///
+ PDF = 1,
+
+ }
+
+ ///
+ /// 数据类型
+ ///
+ public enum ClinicalDataType
+ {
+ ///
+ /// 既往局部治疗史
+ ///
+ MedicalHistory = 0,
+
+ ///
+ /// 影像模态（PET临床信息）
+ ///
+ PET = 1,
+
+ ///
+ /// 胸水
+ ///
+ Hydrothorax = 2,
+ }
+
+ ///
+ /// 临床分组类型
+ ///
+ public enum ClinicalScopeType
+ {
+ ///
+ /// 受试者
+ ///
+ Subject = 0,
+
+ ///
+ /// 访视
+ ///
+ Visit = 1,
+
+ ///
+ /// 阅片
+ ///
+ Read = 2,
+ }
}
diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData.cs b/IRaCIS.Core.Domain/Reading/ClinicalData.cs
index d8f99a565..93003d8ed 100644
--- a/IRaCIS.Core.Domain/Reading/ClinicalData.cs
+++ b/IRaCIS.Core.Domain/Reading/ClinicalData.cs
@@ -31,19 +31,19 @@ namespace IRaCIS.Core.Domain.Models
public Guid? VisitOrReadId { get; set; }
///
- /// 分组类型
+ /// 分组类型(受试者)
///
- public int? ScopeType { get; set; }
+ public ClinicalScopeType? ScopeType { get; set; }
///
/// 数据类型
///
- public int? DataType { get; set; }
+ public ClinicalDataType? DataType { get; set; }
///
- /// 上传方式
+ /// 上传方式()
///
- public int? UploadType { get; set; }
+ public ClinicalUploadType? UploadType { get; set; }
///
/// 创建时间
@@ -58,5 +58,8 @@ namespace IRaCIS.Core.Domain.Models
}
+
+
+
}