From ea48fcac64a0e956bc05852c13d08270c62a389d Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 20 Jun 2023 17:09:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Reading/ClinicalData/ClinicalDataSetService.cs    | 3 ++-
 .../Reading/ClinicalData/ClinicalDataSystemSet.cs             | 4 ++--
 .../Reading/ClinicalData/ClinicalDataTrialSet.cs              | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs
index 60a5e7fb4..fe7aaa3b9 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs
@@ -261,7 +261,7 @@ namespace IRaCIS.Application.Services
             //不存在的时候，就将系统数据同步到项目临床数据配置
             if (!await _clinicalDataTrialSetRepository.AnyAsync(x => x.TrialId == trialId && x.SystemClinicalDataSetId != null))
             {
-                var systemClinicalDataList = await _clinicalDataSystemSetRepository.Where(x=>x.IsFinish).AsQueryable().ToListAsync();
+                var systemClinicalDataList = await _clinicalDataSystemSetRepository.Where(x=>x.IsApply).AsQueryable().ToListAsync();
                 var systemIds = systemClinicalDataList.Select(x => x.Id).ToList();
 
                 var trialSystemClinicalDataSetIds = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == trialId && x.SystemClinicalDataSetId != null).Select(x => x.SystemClinicalDataSetId.Value).ToListAsync();
@@ -286,6 +286,7 @@ namespace IRaCIS.Application.Services
                     FileName = x.FileName,
                     Path = x.Path,
                     TrialId = trialId,
+                    IsApply = x.IsApply,
 
                     //项目不采用 标准枚举字符串的方式
                     //CriterionEnumListStr=x.CriterionEnumListStr
diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs
index d6fe0fb4d..12bf5729d 100644
--- a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs
+++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs
@@ -27,9 +27,9 @@ namespace IRaCIS.Core.Domain.Models
 		public string ClinicalDataSetName { get; set; }
 
         /// <summary>
-        /// 是否配置完成
+        /// 是否应用
         /// </summary>
-        public bool IsFinish { get; set; } = false;
+        public bool IsApply { get; set; } = false;
 
         /// <summary>
         /// 英文名称
diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs
index 4260c2098..fef381af9 100644
--- a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs
+++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs
@@ -65,9 +65,9 @@ namespace IRaCIS.Core.Domain.Models
 
 
         /// <summary>
-        /// 是否配置完成
+        /// 是否应用
         /// </summary>
-        public bool IsFinish { get; set; } = false;
+        public bool IsApply { get; set; } = false;
 
         /// <summary>
         /// 上传角色