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 @@
+
+
+ 获取所有字典的Key
+
+
+
添加字典 的同时 一起添加子项 --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> GetSubjectCancelDoctorHistoryList(Guid subjectId)
+ public async Task> GetSubjectCancelDoctorHistoryList(Guid subjectId,Guid trialReadingCriterionId)
{
- var list = await _subjectCanceDoctorRepository.Where(t => t.SubjectId == subjectId).ProjectTo(_mapper.ConfigurationProvider).ToListAsync();
+ var list = await _subjectCanceDoctorRepository.Where(t => t.SubjectId == subjectId && t.TrialReadingCriterionId==trialReadingCriterionId).ProjectTo(_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; }
+
+
+ }
}