修改一版

2022-07-21 11:03:09 +08:00
parent fad8b0ffaa
commit 6bfbd3109b
1 changed files with 2 additions and 2 deletions
@@ -154,7 +154,7 @@ namespace IRaCIS.Application.Services
            };

            result.TaskList = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
-                 x.SubjectId == taskInfo.SubjectId && x.ArmEnum == taskInfo.ArmEnum&&x.IsAnalysisCreate== taskInfo.IsAnalysisCreate && x.VisitTaskNum < taskInfo.VisitTaskNum)
+                 x.SubjectId == taskInfo.SubjectId && x.ArmEnum == taskInfo.ArmEnum&&x.IsAnalysisCreate== taskInfo.IsAnalysisCreate&&(x.TaskState==TaskState.Effect||x.TaskState==TaskState.HaveReturned) && x.VisitTaskNum < taskInfo.VisitTaskNum)
                .OrderBy(x => x.VisitTaskNum).Select(x => new GlobalVisitInfo()
                {
                    VisitName = x.SourceSubjectVisit.VisitName,
@@ -197,7 +197,7 @@ namespace IRaCIS.Application.Services
                    Answer = globalReadingQuestion.Where(y => y.TaskId == x.VisitTaskId && y.QuestionId == null).Select(x => x.Answer).FirstOrDefault() ?? String.Empty,
                    QuestionName = "原因",
                    Type = "input",
-                    QuestionId=default(Guid),
+                  

                };