XCKJ
/
EI-Image-Viewer-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改查询bug

Test.EIImageViewer
hang 2023-03-08 11:05:55 +08:00
parent 5ef01658d6
commit 6e3145685d
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
View File

@ -670,7 +670,7 @@ namespace IRaCIS.Core.Application.Service
{ {
var trialId = inQuery.TrialId; 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 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 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() select new TaskConsistentRuleView()

4
IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs
View File

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

8
IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
View File

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