修改查询bug

IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs

@@ -670,7 +670,7 @@ namespace IRaCIS.Core.Application.Service
         {
             var trialId = inQuery.TrialId;
 
-            var taskConsistentRuleQueryable = from enroll in _repository.Where<Enroll>(t => t.TrialId == trialId)
+            var taskConsistentRuleQueryable = from enroll in _repository.Where<Enroll>(t => t.TrialId == trialId && t.EnrollStatus==EnrollStatus.ConfirmIntoGroup)
                                               join user in _repository.Where<User>() on enroll.DoctorId equals user.DoctorId
                                               join taskConsistentRule in _repository.Where<TaskConsistentRule>(t => t.TrialId == trialId &&t.TrialReadingCriterionId==inQuery.TrialReadingCriterionId  && t.IsSelfAnalysis) on enroll.TrialId equals taskConsistentRule.TrialId
                                               select new TaskConsistentRuleView()

IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs

@@ -296,8 +296,8 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<VisitTask, InfluenceTaskInfo>()
                .ForMember(o => o.TrialReadingCriterionName, t => t.MapFrom(u => u.TrialReadingCriterion.CriterionName))
-               .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode))
-               .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code))
+              .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.IsAnalysisCreate == true ? u.BlindTrialSiteCode : u.Subject.TrialSite.TrialSiteCode))
+                 .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.IsAnalysisCreate == true ? u.BlindSubjectCode : u.Subject.Code))
                 .ForMember(o => o.OptType, t => t.Ignore());
 
 

IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs

@@ -288,10 +288,16 @@ namespace IRaCIS.Core.Application.Service
 
 
 
-
+                t.IsAnalysisCreate,
                 t.TrialReadingCriterionId,
             }).FirstNotNullAsync();
 
+
+            if (taskInfo.IsAnalysisCreate)
+            {
+                return string.Empty;
+            }
+
             #endregion