增加标准

2022-10-12 11:50:07 +08:00
parent e6056623f8
commit d359d801bd
3 changed files with 7 additions and 6 deletions
@@ -45,14 +45,15 @@ namespace IRaCIS.Core.Application.Service
        /// </summary>
        /// <param name="trialId"></param>
        /// <returns></returns>
-        public async Task<List<TaskAllocationRuleDTO>> GetDoctorPlanAllocationRuleList(Guid trialId)
+        public async Task<(List<TaskAllocationRuleDTO>,object)> GetDoctorPlanAllocationRuleList(Guid trialId)
        {

            var list = await _taskAllocationRuleRepository.Where(t => t.TrialId == trialId).ProjectTo<TaskAllocationRuleDTO>(_mapper.ConfigurationProvider).ToListAsync();

-            //var trialTaskConfig = _trialRepository.Where(t => t.Id == trialId).ProjectTo<TrialProcessConfigDTO>(_mapper.ConfigurationProvider).FirstOrDefault();
+            //所有标准都是一样  后台只返回任意一个标准的就好了
+            var trialTaskConfig = _repository.Where<ReadingQuestionCriterionTrial>(t => t.TrialId == trialId && t.IsConfirm).ProjectTo<TrialTaskConfigView>(_mapper.ConfigurationProvider).FirstOrDefault();

-            return /*(*/list/*, trialTaskConfig)*/;
+            return (list, trialTaskConfig);
        }


@@ -188,9 +188,9 @@ namespace IRaCIS.Core.Application.Service.Allocation
        /// <param name="subjectId"></param>

        /// <returns></returns>
-        public async Task<List<SubjectUserDTO>> GetSubjectAssignedDoctorList(Guid subjectId)
+        public async Task<List<SubjectUserDTO>> GetSubjectAssignedDoctorList(Guid subjectId, Guid trialReadingCriterionId)
        {
-            var list = await _subjectUserRepository.Where(t => t.SubjectId == subjectId && t.OrignalSubjectUserId == null && t.IsConfirmed).ProjectTo<SubjectUserDTO>(_mapper.ConfigurationProvider).ToListAsync();
+            var list = await _subjectUserRepository.Where(t => t.SubjectId == subjectId && t.OrignalSubjectUserId == null && t.IsConfirmed && t.TrialReadingCriterionId==trialReadingCriterionId).ProjectTo<SubjectUserDTO>(_mapper.ConfigurationProvider).ToListAsync();

            return list;
        }