From 407e831b9a60f56a82cb241d7c4e7276c35069e4 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 21 Nov 2022 17:31:22 +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

---
 .../IRaCIS.Core.Application.xml               |  7 ++++
 .../Service/QC/DTO/QCListViewModel.cs         | 41 +++++++++++++++++++
 IRaCIS.Core.Application/TestService.cs        | 15 +++----
 3 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 00f3eba97..91bb360b3 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -8939,6 +8939,13 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.ReadClinicalData(IRaCIS.Core.Application.Service.Reading.Dto.ReadClinicalDataInDto)">
+            <summary>
+            阅读临床数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.AddDefaultValueToTask(System.Guid)">
             <summary>
             添加默认值到任务里面
diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
index bb2ccbce4..432703246 100644
--- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
+++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
@@ -297,6 +297,47 @@ namespace IRaCIS.Core.Application.Contracts
     }
 
 
+    public class SubjectReadingPeriodExportDto
+    {
+        [DictionaryTranslateAttribute("Subject_Visit_Status")]
+
+        public SubjectStatus Status { get; set; }
+
+        public string Code { get; set; } = String.Empty;
+
+        public string TrialSiteCode { get; set; } = string.Empty;
+
+
+        
+
+
+
+    }
+
+    public class ReadingPeriodOrVisitInfo
+    {
+
+
+
+        public Guid SubjectVisitId { get; set; }
+
+        //核查状态
+        public CheckStateEnum CheckState { get; set; }
+
+        //提交状态
+        public SubmitStateEnum SubmitState { get; set; }
+        //审核状态
+        public AuditStateEnum AuditState { get; set; }
+
+        //阅片期或者访视名
+        public string ReadingPeriodName { get; set; }
+
+
+
+
+        //public ForwardStateEnum ForwardState { get; set; }
+    }
+
     public class ReadPeriodQuery
     {
         public Guid TrialId { get; set; }
diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs
index 02b140b39..9c09c9958 100644
--- a/IRaCIS.Core.Application/TestService.cs
+++ b/IRaCIS.Core.Application/TestService.cs
@@ -72,17 +72,17 @@ namespace IRaCIS.Application.Services
 
             var list2 = query.ToList();
 
+            await Task.CompletedTask;
 
+            //var list = await _repository.Where<ClinicalDataTrialSet>(t => t.TrialId == Guid.Parse("40400000-3e2c-0016-239b-08da581f0e74")).ToListAsync();
 
-            var list = await _repository.Where<ClinicalDataTrialSet>(t => t.TrialId == Guid.Parse("40400000-3e2c-0016-239b-08da581f0e74")).ToListAsync();
+            ////await _repository.BatchDeleteAsync<ClinicalDataTrialSet>(t => t.TrialId == Guid.Parse("40400000-3e2c-0016-239b-08da581f0e74"));
 
-            //await _repository.BatchDeleteAsync<ClinicalDataTrialSet>(t => t.TrialId == Guid.Parse("40400000-3e2c-0016-239b-08da581f0e74"));
+            //await _repository.AddRangeAsync(list, true);
 
-            await _repository.AddRangeAsync(list, true);
+            //await _repository.SaveChangesAsync();
 
-            await _repository.SaveChangesAsync();
-
-            await _repository.BatchUpdateAsync<DataInspection>(t => t.TrialId == Guid.Parse("40400000-3e2c-0016-239b-08da581f0e74") && t.EntityName== "ClinicalDataTrialSet", t => new DataInspection() { CreateTime= DateTime.Now.AddMonths(-2) }  );
+            //await _repository.BatchUpdateAsync<DataInspection>(t => t.TrialId == Guid.Parse("40400000-3e2c-0016-239b-08da581f0e74") && t.EntityName== "ClinicalDataTrialSet", t => new DataInspection() { CreateTime= DateTime.Now.AddMonths(-2) }  );
 
             return _userInfo.LocalIp;
         }
@@ -109,11 +109,12 @@ namespace IRaCIS.Application.Services
         public async Task Get(TestModel testModel)
         {
 
+            await Task.CompletedTask;
 
             //update DicomInstance set Path = '/IRaCISData/TrialData/' + cast(DicomInstance.TrialId as varchar) + '/' + DicomInstance.SiteId + '/' + DicomInstance.SubjectId + '/' + DicomInstance.SubjectVisitId + '/Dicom/' + DicomInstance.StudyId + '/' + DicomInstance.Id + '.dcm'
 
 
-            await _repository.BatchUpdateAsync<DicomInstance>(u=>u.Id!=Guid.Empty,t => new DicomInstance() { Path = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{t.TrialId}/{t.SiteId}/{t.SubjectId}/{t.SubjectVisitId}/{StaticData.Folder.DicomFolder}/{t.StudyId}/{t.Id}.dcm" });
+            //await _repository.BatchUpdateAsync<DicomInstance>(u=>u.Id!=Guid.Empty,t => new DicomInstance() { Path = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{t.TrialId}/{t.SiteId}/{t.SubjectId}/{t.SubjectVisitId}/{StaticData.Folder.DicomFolder}/{t.StudyId}/{t.Id}.dcm" });
 
 
             // Load a document.