修改一版

2022-10-20 16:26:42 +08:00
parent 2d09331903
commit fe046d8842
7 changed files with 87 additions and 31 deletions
@@ -92,7 +92,6 @@ namespace IRaCIS.Application.Services
            {
                GlobalTaskId = inDto.VisitTaskId,
                ReadingTaskState = taskInfo.ReadingTaskState,
-                GlobalUpdateType = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == taskInfo.TrialReadingCriterionId).Select(x => x.GlobalUpdateType).FirstOrDefaultAsync(),

            };

@@ -201,10 +200,13 @@ namespace IRaCIS.Application.Services
            });


-
+            var subjectVisitId = await _readModuleRepository.Where(x => x.Id == taskInfo.SouceReadModuleId).Select(x => x.SubjectVisitId).FirstOrDefaultAsync();
+            var isBaseLine = await _subjectVisitRepository.Where(x => x.Id == subjectVisitId).Select(x => x.IsBaseLine).FirstOrDefaultAsync();
            List<GetAssessTypeOutDto> assessTypeList = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == taskInfo.TrialReadingCriterionId
          && x.ParentCode == ReadingCommon.GlobalAssess
          )
+               .WhereIf(isBaseLine,x=>x.IsBaseLineUse)
+               .WhereIf(!isBaseLine,x=>x.IsFollowVisitUse)
          .Select(x => new GetAssessTypeOutDto()
          {
              Id = x.Id,
@@ -387,7 +387,8 @@ namespace IRaCIS.Application.Services
                IsShowInDicom = x.IsShowInDicom,
                Type = x.Type,
                QuestionType=x.QuestionType,
-                QuestionGenre=x.QuestionGenre,
+                LesionType=x.LesionType,
+                QuestionGenre =x.QuestionGenre,
                DictionaryCode =x.DictionaryCode,
                TypeValue = x.TypeValue,
                QuestionName = x.QuestionName,
@@ -406,7 +407,7 @@ namespace IRaCIS.Application.Services
                    QuestionId = x.Id,
                    IsShowInDicom = x.IsShowInDicom,
                    QuestionName = x.QuestionName,
-
+                    LesionType = x.LesionType,
                    QuestionGenre = x.QuestionGenre,
                    DictionaryCode = x.DictionaryCode,
                    Type = x.Type,
@@ -445,7 +446,8 @@ namespace IRaCIS.Application.Services
                        QuestionName = question.OrderMark + x.RowIndex.GetLesionMark(),
                        SplitOrMergeLesionName = x.MergeName.IsNullOrEmpty() ? x.SplitName : x.MergeName,
                        SplitOrMergeType = x.SplitOrMergeType,
-                        IsCanEditPosition=x.IsCanEditPosition,
+                        LesionType = question.LesionType,
+                        IsCanEditPosition =x.IsCanEditPosition,
                        RowIndex =x.RowIndex,
                    }).ToList();

@@ -459,6 +461,7 @@ namespace IRaCIS.Application.Services
                            QuestionId = x.ReadingQuestionId,
                            TableQuestionId = x.Id,
                            Type = x.Type,
+                            LesionType = x.ReadingQuestionTrial.LesionType,
                            TableQuestionType = x.TableQuestionType,
                            DictionaryCode = x.DictionaryCode,
                            QuestionMark = x.QuestionMark,