diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs
index be53ee3e3..7e403e2ad 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs
@@ -9,8 +9,34 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
{
- public class ClinicalDataTrialSetAddOrEdit : ClinicalDataSystemSetAddOrEdit
+ public class ClinicalDataTrialSetAddOrEdit
{
+ public Guid? Id { get; set; }
+
+
+
+
+ ///
+ /// 名称
+ ///
+ public string ClinicalDataSetName { get; set; }
+
+ ///
+ /// 临床级别
+ ///
+ public ClinicalLevel ClinicalDataLevel { get; set; }
+
+
+ ///
+ /// 上传方式
+ ///
+ public ClinicalUploadType ClinicalUploadType { get; set; }
+
+ ///
+ /// 是否启用
+ ///
+ public bool IsEnable { get; set; }
+
///
/// 项目ID
///
@@ -26,6 +52,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
{
public Guid? Id { get; set; }
+
+ ///
+ /// 枚举
+ ///
+ public int ClinicalDataSetEnum { get; set; }
+
///
/// 名称
///
@@ -52,8 +84,41 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
- public class ClinicalDataTrialSetView : ClinicalDataSystemSetView
+ public class ClinicalDataTrialSetView
{
+
+ public Guid Id { get; set; }
+
+
+
+
+ ///
+ /// 名称
+ ///
+ public string ClinicalDataSetName { get; set; }
+
+ ///
+ /// 临床级别
+ ///
+ public ClinicalLevel ClinicalDataLevel { get; set; }
+
+
+ ///
+ /// 上传方式
+ ///
+ public ClinicalUploadType ClinicalUploadType { get; set; }
+
+ ///
+ /// 创建时间
+ ///
+ public DateTime CreateTime { get; set; }
+
+ ///
+ /// 创建人
+ ///
+ public Guid CreateUserId { get; set; }
+
+
///
/// 项目ID
///
@@ -91,6 +156,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
{
public Guid Id { get; set; }
+
+ ///
+ /// 枚举
+ ///
+ public int ClinicalDataSetEnum { get; set; }
+
///
/// 名称
///
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index 4491bf44e..caeab0956 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -311,8 +311,17 @@ namespace IRaCIS.Core.Application
_mapper.Map(trialConfig, trialInfo);
trialInfo.UpdateTime = DateTime.Now;
- //__clinicalDataTrialSetRepository.up
+
+ await _clinicalDataTrialSetRepository.BatchUpdateNoTrackingAsync(x => x.TrialId == trialConfig.TrialId, x => new ClinicalDataTrialSet
+ {
+ IsConfirm = false
+ });
+ await _clinicalDataTrialSetRepository.BatchUpdateNoTrackingAsync(x => x.TrialId == trialConfig.TrialId && x.IsCheck, x => new ClinicalDataTrialSet
+ {
+
+ IsConfirm = true
+ });
return ResponseOutput.Ok(await _repository.SaveChangesAsync());
}
diff --git a/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs b/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs
index 96208ed59..9eaca77eb 100644
--- a/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs
+++ b/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs
@@ -136,19 +136,19 @@ namespace IRaCIS.Core.Application.Triggers
await _readModuleRepository.DeleteFromQueryAsync(x => x.ReadingSetType == ReadingSetType.ImageReading && x.SubjectVisitId == subjectVisitId, true);
- await _readModuleRepository.AddAsync(new ReadModule()
- {
- ReadingPeriodSetId = readingPeriodSet.Id,
- IsUrgent = subjectVisit.IsUrgent,
- SubjectVisitId = subjectVisitId,
- Status = ReadModuleEnum.TaskAllocation,
- SubjectId = subjectVisit.SubjectId,
- ModuleName = "Global",// 全局阅片
- ReadingSetType = ReadingSetType.ImageReading,
- ModuleType = ModuleTypeEnum.Global,
- TrialId = subjectVisit.TrialId,
- VisitNum = subjectVisit.VisitNum,
- });
+ await _readModuleRepository.AddAsync(new ReadModule()
+ {
+ ReadingPeriodSetId = readingPeriodSet.Id,
+ IsUrgent = subjectVisit.IsUrgent,
+ SubjectVisitId = subjectVisitId,
+ Status = ReadModuleEnum.TaskAllocation,
+ SubjectId = subjectVisit.SubjectId,
+ ModuleName = "Global",// 全局阅片
+ ReadingSetType = ReadingSetType.ImageReading,
+ ModuleType = ModuleTypeEnum.Global,
+ TrialId = subjectVisit.TrialId,
+ VisitNum = subjectVisit.VisitNum,
+ });
await _readModuleRepository.SaveChangesAsync();
diff --git a/IRaCIS.Core.Domain/Reading/ClinicalDataSystemSet.cs b/IRaCIS.Core.Domain/Reading/ClinicalDataSystemSet.cs
index 6806ce7bc..2f25af725 100644
--- a/IRaCIS.Core.Domain/Reading/ClinicalDataSystemSet.cs
+++ b/IRaCIS.Core.Domain/Reading/ClinicalDataSystemSet.cs
@@ -15,8 +15,10 @@ namespace IRaCIS.Core.Domain.Models
public class ClinicalDataSystemSet : Entity, IAuditAdd
{
-
-
+ ///
+ /// 枚举
+ ///
+ public int ClinicalDataSetEnum { get; set; }
///
/// 名称