修改一版

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

@@ -500,6 +500,21 @@
             创建人
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSetView.IsEnable">
+            <summary>
+            是否启用
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSetView.IsCheck">
+            <summary>
+            是否勾选
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSetView.IsFromSystemData">
+            <summary>
+            是否来自于系统数据
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataInDto.TrialId">
             <summary>
             项目Id
@@ -3223,6 +3238,12 @@
             <param name="query"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Application.Services.ClinicalDataSetService.GetSystemClinicalDataSetList">
+            <summary>
+            获取系统临床数据
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Application.Services.ClinicalDataSetService.AddTrialClinicalDataSet(IRaCIS.Core.Application.Service.Reading.Dto.AddTrialClinicalDataSetInDto)">
             <summary>
             将系统配置添加到项目配置

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

@@ -67,11 +67,27 @@ namespace IRaCIS.Application.Services
             return pageList;
         }
 
+        /// <summary>
+        /// 获取系统临床数据
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<List<ClinicalDataSetView>> GetSystemClinicalDataSetList()
+        {
+            return await _clinicalDataSetRepository.AsQueryable()
+             .Where(x => x.TrialId == null)
+             .ProjectTo<ClinicalDataSetView>(_mapper.ConfigurationProvider).ToListAsync();
+        }
 
-        //public List<ClinicalDataSetView> GetClinicalDataSetList()
+        public async Task<List<ClinicalDataSetView>> GetTrialClinicalDataSetList(AddTrialClinicalDataSetInDto inDto)
-        //{
+        {
-            
+            await this.AddTrialClinicalDataSet(inDto);
-        //}
+
+            return await _clinicalDataSetRepository.AsQueryable()
+               .Where(x => x.TrialId == inDto.TrialId)
+               .ProjectTo<ClinicalDataSetView>(_mapper.ConfigurationProvider).ToListAsync();
+
+        }
 
 
         /// <summary>
@@ -79,7 +95,7 @@ namespace IRaCIS.Application.Services
         /// </summary>
         /// <param name="inDto"></param>
         /// <returns></returns>
-      
+
         private async Task<IResponseOutput> AddTrialClinicalDataSet(AddTrialClinicalDataSetInDto inDto)
         {
             var systemIds = await _clinicalDataSetRepository.Where(x => x.TrialId == null).Select(x => x.Id).ToListAsync();

IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs

@@ -87,6 +87,25 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// 创建人
         /// </summary>
         public Guid CreateUserId { get; set; }
+
+        /// <summary>
+		/// 是否启用
+		/// </summary>
+		public bool IsEnable { get; set; }
+
+        /// <summary>
+        /// 是否勾选
+        /// </summary>
+        public bool IsCheck { get; set; }
+
+        /// <summary>
+        /// 是否来自于系统数据
+        /// </summary>
+        public bool IsFromSystemData {
+            get {
+                return this.SystemClinicalDataSetId == null ? false : true;
+            }
+        }
     }
 
     public class ClinicalDataInDto

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

@@ -52,7 +52,7 @@ namespace IRaCIS.Application.Services
         [HttpPost]
         public async Task<IResponseOutput> AddOrUpdateReadingPeriodSet(ReadingPeriodSetAddOrEdit addOrEditReadingPeriodSet)
         {
-            if (await _readingPeriodSetRepository.AnyAsync(x => x.Id != addOrEditReadingPeriodSet.Id && x.ReadingPeriodName == addOrEditReadingPeriodSet.ReadingPeriodName))
+            if (await _readingPeriodSetRepository.AnyAsync(x => x.Id != addOrEditReadingPeriodSet.Id &&x.TrialId==addOrEditReadingPeriodSet.TrialId && x.ReadingPeriodName == addOrEditReadingPeriodSet.ReadingPeriodName))
             {
                 return ResponseOutput.NotOk("阅片期名称重复,操作失败");
             }