From 907d0d39a10c229e7cd42e4586a68cf170269ae8 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 5 Jun 2024 09:48:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=8C=BB=E7=94=9F=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=87=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/IRaCIS.Core.Application.xml        | 6 ++++++
 .../Service/Allocation/TaskAllocationRuleService.cs        | 4 ++--
 .../Service/Allocation/VisitTaskService.cs                 | 2 +-
 IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs             | 7 +++++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index c4439a71d..7c6d7a452 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -12599,6 +12599,12 @@
             <param name="addOrEditBasic"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Application.Services.DictionaryService.GetAllDictionaryKey">
+            <summary>
+            获取所有字典的Key
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Application.Services.DictionaryService.AddBasicDicAndChild(IRaCIS.Application.Contracts.AddBasicDicAndChild)">
             <summary>
             添加字典 的同时 一起添加子项  --New  
diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs
index 5e322a36f..dc0b7add1 100644
--- a/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs
@@ -116,9 +116,9 @@ namespace IRaCIS.Core.Application.Service
         //    return ResponseOutput.Ok();
         //}
 
-        public async Task<List<SubjectCancelDoctorView>> GetSubjectCancelDoctorHistoryList(Guid subjectId)
+        public async Task<List<SubjectCancelDoctorView>> GetSubjectCancelDoctorHistoryList(Guid subjectId,Guid trialReadingCriterionId)
         {
-            var list = await _subjectCanceDoctorRepository.Where(t => t.SubjectId == subjectId).ProjectTo<SubjectCancelDoctorView>(_mapper.ConfigurationProvider).ToListAsync();
+            var list = await _subjectCanceDoctorRepository.Where(t => t.SubjectId == subjectId && t.TrialReadingCriterionId==trialReadingCriterionId).ProjectTo<SubjectCancelDoctorView>(_mapper.ConfigurationProvider).ToListAsync();
 
             return list;
         }
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 124eb864b..b899b59ce 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -306,7 +306,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
             var subjectId = cancelCommand.CancelList.First().SubjectId;
 
-            await _repository.AddAsync(new SubjectCanceDoctor() { SubjectId = subjectId, Note = cancelCommand.Note });
+            await _repository.AddAsync(new SubjectCanceDoctor() { SubjectId = subjectId, Note = cancelCommand.Note,TrialReadingCriterionId=cancelCommand.TrialReadingCriterionId });
 
             await _visitTaskRepository.SaveChangesAsync();
 
diff --git a/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs b/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs
index 7be50545f..558fff30b 100644
--- a/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs
+++ b/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs
@@ -25,7 +25,10 @@ namespace IRaCIS.Core.Domain.Models
 		public Guid SubjectId { get; set; }
 
 		public string Note { get; set; }
-	 
-	 }
+
+	    public Guid? TrialReadingCriterionId { get; set; }
+
+
+     }
 
 }