代码分类简单调整

2022-10-17 15:10:36 +08:00
parent a1913ca5b3
commit 1923b0eee7
3 changed files with 110 additions and 119 deletions
@@ -350,6 +350,8 @@ namespace IRaCIS.Core.Application.ViewModel

        public Guid? SubjectId { get; set; }

+        public Guid? DoctorUserId { get; set; }
+

        public string SubjectCode { get; set; } = String.Empty;

@@ -85,6 +85,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
            var subjectQuery = _subjectRepository.Where(t => t.TrialId == querySubjectAssign.TrialId && t.SubjectVisitTaskList.Any())
                 .WhereIf(querySubjectAssign.SiteId != null, t => t.SiteId == querySubjectAssign.SiteId)
                 .WhereIf(querySubjectAssign.SubjectId != null, t => t.Id == querySubjectAssign.SubjectId)
+                 .WhereIf(querySubjectAssign.DoctorUserId != null, t => t.SubjectDoctorList.Any(t=>t.DoctorUserId==querySubjectAssign.DoctorUserId && t.TrialReadingCriterionId==querySubjectAssign.TrialReadingCriterionId))
                 .WhereIf(!string.IsNullOrEmpty(querySubjectAssign.SubjectCode), t => t.Code.Contains(querySubjectAssign.SubjectCode))

                 .ProjectTo<SubjectAssignStat>(_mapper.ConfigurationProvider,new { trialReadingCriterionId=querySubjectAssign.TrialReadingCriterionId });