修改一版

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; }
+
+
+    
+
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string ClinicalDataSetName { get; set; }
+
+        /// <summary>
+        /// 临床级别
+        /// </summary>
+        public ClinicalLevel ClinicalDataLevel { get; set; }
+
+
+        /// <summary>
+        /// 上传方式
+        /// </summary>
+        public ClinicalUploadType ClinicalUploadType { get; set; }
+
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public bool IsEnable { get; set; }
+
         /// <summary>
         /// 项目ID
         /// </summary>
@@ -26,6 +52,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     {
         public Guid? Id { get; set; }
 
+
+        /// <summary>
+        /// 枚举
+        /// </summary>
+        public int ClinicalDataSetEnum { get; set; }
+
         /// <summary>
         /// 名称
         /// </summary>
@@ -52,8 +84,41 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
    
 
-    public class ClinicalDataTrialSetView : ClinicalDataSystemSetView
+    public class ClinicalDataTrialSetView
     {
+
+        public Guid Id { get; set; }
+
+
+     
+
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string ClinicalDataSetName { get; set; }
+
+        /// <summary>
+        /// 临床级别
+        /// </summary>
+        public ClinicalLevel ClinicalDataLevel { get; set; }
+
+
+        /// <summary>
+        /// 上传方式
+        /// </summary>
+        public ClinicalUploadType ClinicalUploadType { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public Guid CreateUserId { get; set; }
+
+
         /// <summary>
         /// 项目ID
         /// </summary>
@@ -91,6 +156,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     {
         public Guid Id { get; set; }
 
+
+        /// <summary>
+        /// 枚举
+        /// </summary>
+        public int ClinicalDataSetEnum { get; set; }
+
         /// <summary>
         /// 名称
         /// </summary>

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());
         }

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();

IRaCIS.Core.Domain/Reading/ClinicalDataSystemSet.cs

@@ -15,8 +15,10 @@ namespace IRaCIS.Core.Domain.Models
 	public class ClinicalDataSystemSet : Entity, IAuditAdd
 	{
 
-		
-
+		/// <summary>
+		/// 枚举
+		/// </summary>
+		public int ClinicalDataSetEnum { get; set; }
 
 		/// <summary>
 		/// 名称