From 93b06597fa04699e697cb398e92492cbee583836 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 9 Jun 2022 16:19: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

---
 .../Reading/Dto/ReadingClinicalDataDto.cs     |  7 ++--
 .../Reading/ReadingClinicalDataService.cs     | 25 ++++++++++---
 .../TrialSiteUser/DTO/TrialConfigDTO.cs       |  5 ++-
 .../TrialSiteUser/TrialConfigService.cs       | 35 ++++++++++---------
 4 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
index 4a248f2ea..abf3b9286 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
@@ -33,7 +33,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		public bool IsVisit { get; set; }
 	}
 
-	public class GetTrialClinicalData
-	{ 
-	}
+	public class GetTrialClinicalDataSelectIndto
+	{
+        public int MyProperty { get; set; }
+    }
 }
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs
index 7d9864c1d..c0254a444 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs
@@ -13,7 +13,7 @@ using MassTransit;
 namespace IRaCIS.Application.Services
 {
     /// <summary>
-    /// 临床数据配置
+    /// 阅片临床数据配置
     /// </summary>
     [ApiExplorerSettings(GroupName = "Reading")]
     public class ClinicalDataSetService : BaseService
@@ -39,7 +39,24 @@ namespace IRaCIS.Application.Services
             return ResponseOutput.Ok(entity.Id.ToString());
         }
 
-   
+
+
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpDelete("{id:guid}")]
+        public async Task<IResponseOutput> ReadingClinicalData(Guid id)
+        {
+            await _readingClinicalDataRepository.DeleteFromQueryAsync(x => x.Id == id, true);
+            return ResponseOutput.Result(true);
+        }
+
+
+        //public async Task<> GetTrialClinicalDataSelect()
+
         //public async Task<List<>> GetTrialClinicalData()
 
         ///// <summary>
@@ -78,7 +95,7 @@ namespace IRaCIS.Application.Services
         //}
 
 
-      
+
 
         ///// <summary>
         ///// 将系统配置添加到项目配置
@@ -100,7 +117,7 @@ namespace IRaCIS.Application.Services
         //        ClinicalDataLevel=x.ClinicalDataLevel,
         //        ClinicalUploadType=x.ClinicalUploadType,
         //        TrialId= trialId,
-               
+
         //    }).ToList();
         //    await _clinicalDataTrialSetRepository.AddRangeAsync(dataSets);
         //    var result=  await _clinicalDataTrialSetRepository.SaveChangesAsync();
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
index fbe94a2f2..cb94921e7 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
@@ -16,6 +16,10 @@ namespace IRaCIS.Core.Application.Contracts
         /// </summary>
         public string SubjectCodeRule { get; set; } = string.Empty;
 
+
+
+        public List<Guid> ClinicalDataTrialSetIds { get; set; } = new List<Guid>();
+
         public bool IsSubjectSecondCodeView { get; set; }
 
         /// <summary>
@@ -76,7 +80,6 @@ namespace IRaCIS.Core.Application.Contracts
 
         public List<Guid> CriterionIds { get; set; } = new List<Guid>();
 
-        public List<Guid> ClinicalDataTrialSetIds { get; set; } = new List<Guid>();
 
         public Guid TrialId { get; set; }
 
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index 379ee44f4..955927d5b 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -161,6 +161,24 @@ namespace IRaCIS.Core.Application
             _mapper.Map(trialConfig, trialInfo);
             trialInfo.UpdateTime = DateTime.Now;
 
+
+            var noconfirmids = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == trialConfig.TrialId && !trialConfig.ClinicalDataTrialSetIds.Contains(x.Id)).Select(x => x.Id).ToListAsync();
+            foreach (var item in trialConfig.ClinicalDataTrialSetIds)
+            {
+                await _clinicalDataTrialSetRepository.UpdatePartialFromQueryAsync(item, x => new ClinicalDataTrialSet()
+                {
+                    IsConfirm = true
+                });
+            }
+
+            foreach (var item in noconfirmids)
+            {
+                await _clinicalDataTrialSetRepository.UpdatePartialFromQueryAsync(item, x => new ClinicalDataTrialSet()
+                {
+                    IsConfirm = false
+                });
+            }
+
             return ResponseOutput.Ok(await _repository.SaveChangesAsync());
         }
 
@@ -314,22 +332,7 @@ namespace IRaCIS.Core.Application
 
 
 
-            var noconfirmids = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == trialConfig.TrialId && !trialConfig.ClinicalDataTrialSetIds.Contains(x.Id)).Select(x => x.Id).ToListAsync();
-            foreach (var item in trialConfig.ClinicalDataTrialSetIds)
-            {
-                await _clinicalDataTrialSetRepository.UpdatePartialFromQueryAsync(item, x => new ClinicalDataTrialSet()
-                {
-                    IsConfirm = true
-                });
-            }
-
-            foreach (var item in noconfirmids)
-            {
-                await _clinicalDataTrialSetRepository.UpdatePartialFromQueryAsync(item, x => new ClinicalDataTrialSet()
-                {
-                    IsConfirm = false
-                });
-            }
+