修改

2023-05-05 15:22:07 +08:00
parent 6da34061da
commit 3a03eec1ab
3 changed files with 228 additions and 84 deletions
@@ -117,19 +117,20 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate

            }

-            ReadingCalculateDto readingData = new ReadingCalculateDto()
-            {
-                SubjectId = visitTask.SubjectId,
-                TaskBlindName = visitTask.TaskBlindName,
-                IsConvertedTask = await _visitTaskRepository.Where(x => x.Id == visitTaskId).Select(x => x.IsConvertedTask).FirstOrDefaultAsync(),
-                VisitTaskId = visitTaskId,
-                SubjectVisitId = visitTask.SourceSubjectVisitId!.Value,
-                QuestionInfo = questionInfos,
-                CriterionId = visitTask.TrialReadingCriterionId,
-                TrialId = visitTask.TrialId,
-                IsAnalysisCreate = visitTask.IsAnalysisCreate,
-                IsSelfAnalysis = visitTask.IsSelfAnalysis,
-                IsBaseLine = subjectVisit!.IsBaseLine,
+			ReadingCalculateDto readingData = new ReadingCalculateDto()
+			{
+				SubjectId = visitTask.SubjectId,
+				TaskBlindName = visitTask.TaskBlindName,
+				IsConvertedTask = await _visitTaskRepository.Where(x => x.Id == visitTaskId).Select(x => x.IsConvertedTask).FirstOrDefaultAsync(),
+				BeforeConvertedTaskId = visitTask.BeforeConvertedTaskId,
+				VisitTaskId = visitTaskId,
+				SubjectVisitId = visitTask.SourceSubjectVisitId!.Value,
+				QuestionInfo = questionInfos,
+				CriterionId = visitTask.TrialReadingCriterionId,
+				TrialId = visitTask.TrialId,
+				IsAnalysisCreate = visitTask.IsAnalysisCreate,
+				IsSelfAnalysis = visitTask.IsSelfAnalysis,
+				IsBaseLine = subjectVisit!.IsBaseLine,
                DoctorUserId = visitTask.DoctorUserId,
                TrialReadingCriterionId = visitTask.TrialReadingCriterionId,
                BaseLineTaskId = baseLinetaskId,