From 543c8c4ccbeb88e69c2ab099a08edc24a5912af9 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 8 Jun 2022 17:39:50 +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

---
 .../Service/Reading/ClinicalDataSetService.cs | 21 ++++--
 .../Dto/ClinicalDataServiceViewModel.cs       | 65 ++++++++++++++-----
 2 files changed, 64 insertions(+), 22 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs
index 052fc97be..3a43c4048 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs
@@ -68,11 +68,14 @@ namespace IRaCIS.Application.Services
         /// 获取系统临床数据（系统）
         /// </summary>
         /// <returns></returns>
-        [HttpGet]
-        public async Task<List<ClinicalDataSystemSetView>> GetSystemClinicalDataSystemSetList()
+        [HttpPost]
+        public async Task<List<ClinicalDataSystemSetView>> GetSystemClinicalDataSystemSetList(GetTrialClinicalDataSystemIndto inDto)
         {
             return await _clinicalDataSystemSetRepository.AsQueryable()
-           
+                 .WhereIf(inDto.ClinicalDataLevel != null, x => x.ClinicalDataLevel == inDto.ClinicalDataLevel)
+                .WhereIf(inDto.ClinicalUploadType != null, x => x.ClinicalUploadType == inDto.ClinicalUploadType)
+                 .WhereIf(inDto.ClinicalDataSetName != String.Empty, x => x.ClinicalDataSetName.Contains(inDto.ClinicalDataSetName))
+
              .ProjectTo<ClinicalDataSystemSetView>(_mapper.ConfigurationProvider).ToListAsync();
         }
 
@@ -81,12 +84,16 @@ namespace IRaCIS.Application.Services
         /// </summary>
         /// <param name="inDto"></param>
         /// <returns></returns>
-        [HttpGet]
-        public async Task<List<ClinicalDataTrialSetView>> GetTrialClinicalDataTrialSetList(AddTrialClinicalDataSetInDto inDto)
+        [HttpPost]
+        public async Task<List<ClinicalDataTrialSetView>> GetTrialClinicalDataTrialSetList(GetTrialClinicalDataTrialIndto inDto)
         {
-            await this.AddTrialClinicalDataTrialSet(inDto);
+            await this.AddTrialClinicalDataTrialSet(inDto.TrialId);
             return await _clinicalDataTrialSetRepository.AsQueryable()
+
                .Where(x => x.TrialId == inDto.TrialId)
+               .WhereIf(inDto.ClinicalDataLevel!=null,x=>x.ClinicalDataLevel== inDto.ClinicalDataLevel)
+                .WhereIf(inDto.ClinicalUploadType != null, x => x.ClinicalUploadType == inDto.ClinicalUploadType)
+                 .WhereIf(inDto.ClinicalDataSetName != String.Empty, x => x.ClinicalDataSetName.Contains(inDto.ClinicalDataSetName))
                .ProjectTo<ClinicalDataTrialSetView>(_mapper.ConfigurationProvider).ToListAsync();
 
         }
@@ -97,7 +104,7 @@ namespace IRaCIS.Application.Services
         /// <param name="inDto"></param>
         /// <returns></returns>
 
-        private async Task<IResponseOutput> AddTrialClinicalDataTrialSet(AddTrialClinicalDataSetInDto inDto)
+        private async Task<IResponseOutput> AddTrialClinicalDataTrialSet(Guid trialId)
         {
             var systemIds = await _clinicalDataSystemSetRepository.Select(x => x.Id).ToListAsync();
             var trialSystemIds =await _clinicalDataTrialSetRepository.Where(x => x.TrialId == inDto.TrialId && x.SystemClinicalDataSetId != null).Select(x => x.SystemClinicalDataSetId.Value).ToListAsync();
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs
index 45487b0a3..9563d4585 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs
@@ -13,7 +13,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
     }
 
-    public class ClinicalDataTrialSetAddOrEdit: ClinicalDataSystemSetAddOrEdit
+    public class ClinicalDataTrialSetAddOrEdit : ClinicalDataSystemSetAddOrEdit
     {
         /// <summary>
         /// 项目ID
@@ -23,9 +23,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
     public class ClinicalDataSystemSetAddOrEdit
     {
-        public  Guid? Id { get; set; }
+        public Guid? Id { get; set; }
+
 
-       
 
 
         /// <summary>
@@ -57,7 +57,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
     public class ClinicalDataView : ClinicalData
     {
-        
+
     }
 
     public class ClinicalDataTrialSetView : ClinicalDataSystemSetView
@@ -72,6 +72,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public Guid? SystemClinicalDataSetId { get; set; }
 
+        /// <summary>
+        /// 是否勾选
+        /// </summary>
+        public bool IsCheck { get; set; }
+
         /// <summary>
         /// 是否来自于系统数据
         /// </summary>
@@ -89,7 +94,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     {
         public Guid Id { get; set; }
 
-      
+
 
 
         /// <summary>
@@ -109,7 +114,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public ClinicalUploadType ClinicalUploadType { get; set; }
 
 
-    
+
 
         /// <summary>
         /// 创建时间
@@ -126,12 +131,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public bool IsEnable { get; set; }
 
-        /// <summary>
-        /// 是否勾选
-        /// </summary>
-        public bool IsCheck { get; set; }
 
-     
+
+
     }
 
     public class ClinicalDataInDto
@@ -151,7 +153,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public Guid VisitOrReadId { get; set; }
     }
-    public class ClinicalDataQuery:PageInput
+    public class ClinicalDataQuery : PageInput
     {
         /// <summary>
 		/// 项目ID
@@ -161,14 +163,47 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// <summary>
         /// 名称
         /// </summary>
-        public string ClinicalDataSetName { get; set; }=string.Empty;
+        public string ClinicalDataSetName { get; set; } = string.Empty;
 
     }
+    public class GetTrialClinicalDataSystemIndto
+    {
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string ClinicalDataSetName { get; set; } = String.Empty;
+
+        /// <summary>
+        /// 临床级别
+        /// </summary>
+        public ClinicalLevel? ClinicalDataLevel { get; set; }
+
+
+        /// <summary>
+        /// 上传方式
+        /// </summary>
+        public ClinicalUploadType? ClinicalUploadType { get; set; }
+    }
 
 
-   
-    public class AddTrialClinicalDataSetInDto
+    public class GetTrialClinicalDataTrialIndto
     {
         public Guid TrialId { get; set; }
+
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string ClinicalDataSetName { get; set; } = String.Empty;
+
+        /// <summary>
+        /// 临床级别
+        /// </summary>
+        public ClinicalLevel? ClinicalDataLevel { get; set; }
+
+
+        /// <summary>
+        /// 上传方式
+        /// </summary>
+        public ClinicalUploadType? ClinicalUploadType { get; set; }
     }
 }