IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs

@@ -7,7 +7,6 @@ using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infra.EFCore.Common;
 using IRaCIS.Core.Infrastructure;
 using MassTransit;
-using MassTransit.Initializers;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
@@ -1111,7 +1110,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         }
 
         /// <summary>
-        /// 修改上一次访视结果 并且计算是不是PD
+        /// 修改上一次访视结果
         /// </summary>
         /// <param name="inDto"></param>
         /// <returns></returns>
@@ -1126,48 +1125,75 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
             var isPDResult = false;
 
-            // 先判断有没有上一个任务
             if (lastTask != null)
             {
-                // 查看历史有没有PD
-                var taskIdList = taskList.Select(x => x.VisitTaskId).ToList();
 
-                var pdTaskList  = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId!=inDto.VisitTaskId&& taskIdList.Contains(x.VisitTaskId) && x.ReadingQuestionTrial.QuestionType == QuestionType.SiteVisitForTumorEvaluation && x.Answer == VisitTumorEvaluation.PD.GetEnumInt()).OrderByDescending(x=>x.VisitTask.VisitTaskNum).ToListAsync();
+                #region 1、基线后第一个访视：新病灶计数≥ 2个；2、基线后第二个访视（应满足访视间隔6周以上，否则顺延）新病灶≥ 2个；
+                //1、基线后第一个访视：新病灶计数≥ 2个；2、基线后第二个访视（应满足访视间隔6周以上，否则顺延）新病灶≥ 2个；
 
-                // 当前访视新病灶数量
+
-                var thisNewLesionsCount = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.NewLesionsCount).Select(x => x.Answer).FirstOrDefault().IsNullOrEmptyReturn0();
+                var firstVisit = taskList.FirstOrDefault();
-                // 历史有PD
+                if (baseLineTask != null && baseLineTask.StudyTime != null)
-                if (pdTaskList.Count() > 0&& thisNewLesionsCount >= 2)
+                {
+                    //基线后第二个访视（应满足访视间隔6周以上，否则顺延）
+                    var secondVisit = taskList.Where(x => x.VisitTaskNum >= 2 && x.StudyTime >= baseLineTask.StudyTime.Value.AddDays(42)).FirstOrDefault();
+                    if (secondVisit != null)
+                    {
+
+                        var firstTaskNewLesionsCount = (await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == firstVisit!.VisitTaskId && x.ReadingQuestionTrialId == newLesionsCountQuestionId).Select(x => x.Answer).FirstOrDefaultAsync()).IsNullOrEmptyReturn0();
+
+                        // 第二访视数量
+                        var secondVisitLesionsCount = (await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == lastTask.VisitTaskId && x.ReadingQuestionTrialId == newLesionsCountQuestionId).Select(x => x.Answer).FirstOrDefaultAsync()).IsNullOrEmptyReturn0();
+
+                        // 判断是否是当前访视  当前访视还未入库
+                        if (secondVisit.VisitTaskId == inDto.VisitTaskId)
+                        {
+                            secondVisitLesionsCount = (inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.NewLesionsCount).Select(x => x.Answer).FirstOrDefault()).IsNullOrEmptyReturn0();
+                        }
+
+                        if (firstTaskNewLesionsCount >= 2 && secondVisitLesionsCount >= 2)
                         {
-                    // 满足以下所有条件:1、前序访视已经确定为PD;2、当前访视，新病灶≥2个;
                             isPDResult = true;
                         }
-                else 
+                    }
+
+                    #endregion
+
+
+
+                    if (lastTask.VisitTaskNum >= 2m)
                     {
-                    // 满足以下所有条件:1、前序访视没有评估为PD，2、前一个访视:新病灶计数≥2个;3、当前访视:新病灶2个:4.前后2个访视间隔6周以上。
 
-                    var lastStudyDate = taskList.Where(x=>x.VisitTaskId==lastTask.VisitTaskId).Select(x=>x.StudyTime).FirstOrDefault();
+                        var lastTasknewLesionsCount = (await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == lastTask.VisitTaskId && x.ReadingQuestionTrialId == newLesionsCountQuestionId).Select(x => x.Answer).FirstOrDefaultAsync()).IsNullOrEmptyReturn0();
-                    var thisStudyDate= taskList.Where(x => x.VisitTaskId == inDto.VisitTaskId).Select(x => x.StudyTime).FirstOrDefault();
+                        var thisVisitTaskNewLesionsCount = (inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.NewLesionsCount).Select(x => x.Answer).FirstOrDefault()).IsNullOrEmptyReturn0();
 
-                    var lastNewLesionsStr=await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == lastTask.VisitTaskId && x.ReadingQuestionTrialId == newLesionsCountQuestionId).Select(x => x.Answer).FirstOrDefaultAsync();
+                        var thisVisitTask = taskList.LastOrDefault();
 
-                    var lastNewLesionsCount = lastNewLesionsStr.IsNullOrEmptyReturn0();
+                        if (thisVisitTask != null && thisVisitTask.StudyTime != null && lastTask.StudyTime != null &&
-                    if (lastStudyDate != null && thisStudyDate != null)
+
+
+                            lastTasknewLesionsCount >= 2 && thisVisitTaskNewLesionsCount >= 2 && lastTask.StudyTime.Value.AddDays(42) <= thisVisitTask.StudyTime)
                         {
-                        if (lastNewLesionsCount >= 2 && thisNewLesionsCount >= 2 && thisStudyDate.Value > lastStudyDate.Value.AddDays(42))
+                            isPDResult = true;
+                        }
+                    }
+                }
+
+            }
+            if (isPDResult)
             {
                 var visitForTumorEvaluationQuestionId = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.SiteVisitForTumorEvaluation).Select(x => x.QuestionId).FirstOrDefault();
+
+                if (lastTask != null)
+                {
                     await _readingTaskQuestionAnswerRepository.BatchUpdateNoTrackingAsync(x => x.VisitTaskId == lastTask.VisitTaskId && x.ReadingQuestionTrialId == visitForTumorEvaluationQuestionId, x => new ReadingTaskQuestionAnswer
                     {
                         Answer = VisitTumorEvaluation.PD.GetEnumInt(),
                     });
-                            isPDResult = true;
                 }
             }
 
-                }
 
-            }
             return isPDResult;
         }