Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

2024-05-10 13:19:25 +08:00
parent 01e047f639 4050d7e4a3
commit 51cfadbc77
3 changed files with 28 additions and 2 deletions
@@ -485,7 +485,17 @@ namespace IRaCIS.Application.Services
            {


-                Expression<Func<VisitTask, bool>> visitTaskLambda = x => x.TrialId == trialId && x.SubjectId == subjectId && x.TrialReadingCriterionId == trialReadingCritrialId && x.ArmEnum != Arm.TumorArm;
+                Expression<Func<VisitTask, bool>> visitTaskLambda = x => x.TrialId == trialId && x.SubjectId == subjectId && x.TrialReadingCriterionId == trialReadingCritrialId;
+
+                if (isVisit)
+                {
+                    //访视类型的任务 不影响肿瘤学任务的临床数据状态
+                    visitTaskLambda = visitTaskLambda.And(x => x.ArmEnum != Arm.TumorArm);
+                }
+                else
+                {
+                    visitTaskLambda = visitTaskLambda.And(x => x.ArmEnum == Arm.TumorArm);
+                }


                //维护  IsFrontTaskNeedSignButNotSign   在添加任务哪里用触发器也维护了