修改

2022-10-20 17:44:25 +08:00
parent 45f7a2c0c7
commit 777249bf7a
3 changed files with 12 additions and 2 deletions
@@ -421,7 +421,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                QuestionInfo = questionInfos,
                CriterionId = visitTask.TrialReadingCriterionId,
                TrialId = visitTask.TrialId,
-                IsBaseLine = subjectVisit!.IsBaseLine,
+                IsAnalysisCreate=visitTask.IsAnalysisCreate,
+                IsSelfAnalysis=visitTask.IsSelfAnalysis,
+                 IsBaseLine = subjectVisit!.IsBaseLine,
                DoctorUserId = visitTask.DoctorUserId,
                TrialReadingCriterionId= visitTask.TrialReadingCriterionId,
                BaseLineTaskId = baseLinetaskId,
@@ -1041,6 +1043,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
            {
                // 查询的时候要把自己排除 因为查询出来的可能不是计算出的最新的
                visitTaskAnswerList = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId != inDto.VisitTaskId && x.VisitTask.ReadingCategory == ReadingCategory.Visit
+                && x.VisitTask.IsAnalysisCreate == inDto.IsAnalysisCreate
+                && x.VisitTask.IsSelfAnalysis == inDto.IsSelfAnalysis
                && x.SubjectId == inDto.SubjectId && x.VisitTask.ReadingTaskState == ReadingTaskState.HaveSigned && x.VisitTask.ArmEnum == inDto.ArmEnum && x.VisitTask.TaskState == TaskState.Effect && x.ReadingQuestionTrial.QuestionType == QuestionType.SOD)
                .Select(x => new VisitTaskAnswerInfo
                {