修改

2022-11-09 13:24:57 +08:00
parent 57323bc3f3
commit dfab80657b
3 changed files with 11 additions and 2 deletions
@@ -137,7 +137,7 @@ namespace IRaCIS.Application.Services

            result.TaskList.ForEach(x =>
            {
-                x.AfterQuestionList = x.BeforeQuestionList.GroupJoin(
+                x.AfterQuestionList = x.BeforeQuestionList.Where(x=>x.IsJudgeQuestion).GroupJoin(
                    globalReadingQuestion
                      , l => new { a = l.QuestionId, b = x.VisitTaskId }
                      , r => new { a = r.QuestionId, b = r.TaskId }
@@ -718,6 +718,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
        /// <returns></returns>
        public async Task<string> GetSiteVisitForTumorEvaluation(ReadingCalculateDto inDto)
        {
+            if(inDto.IsBaseLine)
+            {
+                return VisitTumorEvaluation.NA.GetEnumInt();
+            }
           var isPD= await ChangeLastTaskSiteVisitForTumorEvaluation(inDto);
            var newLesionsCount = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.NewLesionsCount).Select(x => x.Answer).FirstOrDefault().IsNullOrEmptyReturn0();
            var baseLineLesionsCount = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.BaseLineLesionsCount).Select(x => x.Answer).FirstOrDefault().IsNullOrEmptyReturn0();