修改
continuous-integration/drone/push Build is passing Details

IRC_NewDev
he 2024-05-09 16:21:16 +08:00
parent 7c850c969e
commit adab66172d
2 changed files with 3 additions and 2 deletions

View File

@ -485,7 +485,7 @@ namespace IRaCIS.Application.Services
{
Expression<Func<VisitTask, bool>> visitTaskLambda = x => x.TrialId == trialId && x.SubjectId == subjectId && x.TrialReadingCriterionId == trialReadingCritrialId;
Expression<Func<VisitTask, bool>> visitTaskLambda = x => x.TrialId == trialId && x.SubjectId == subjectId && x.TrialReadingCriterionId == trialReadingCritrialId && x.ArmEnum != Arm.TumorArm;
//维护 IsFrontTaskNeedSignButNotSign 在添加任务哪里用触发器也维护了

View File

@ -48,7 +48,7 @@ namespace IRaCIS.Core.Application.Triggers
var visitTask = context.Entity;
Expression<Func<VisitTask, bool>> visitTaskLambda = x => x.TrialId == visitTask.TrialId && x.SubjectId == visitTask.SubjectId && x.TrialReadingCriterionId == visitTask.TrialReadingCriterionId;
Expression<Func<VisitTask, bool>> visitTaskLambda = x => x.TrialId == visitTask.TrialId && x.SubjectId == visitTask.SubjectId && x.TrialReadingCriterionId == visitTask.TrialReadingCriterionId&&x.ArmEnum!=Arm.TumorArm;
if (context.ChangeType == ChangeType.Added)
{
@ -61,6 +61,7 @@ namespace IRaCIS.Core.Application.Triggers
{
var visitTaskIdQueryable = _visitTaskRepository.Where(visitTaskLambda) //该Subject 该标准的任务
//小于自己任务号的任务 存在需要签名 但是没签名
.Where(t => t.IsFrontTaskNeedSignButNotSign == false &&
(t.Subject.SubjectVisitTaskList.AsQueryable().Where(visitTaskLambda).Any(c => c.IsNeedClinicalDataSign == true && c.IsClinicalDataSign == false && c.VisitTaskNum < t.VisitTaskNum)