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

@@ -1247,7 +1247,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 // 当前访视新病灶数量
                 var thisNewLesionsCount = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.NewLesionsCount).Select(x => x.Answer).FirstIsNullReturnEmpty().IsNullOrEmptyReturn0();
 
-
                 // 其他访视的BTN
                 var otherBTNStrList =await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId != inDto.VisitTaskId && taskIdList.Contains(x.VisitTaskId) && x.ReadingQuestionTrial.QuestionType == QuestionType.BaseLineLesionsCount).Select(x=>new { 
                 x.VisitTask.VisitTaskNum,
@@ -1255,24 +1254,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 }).ToListAsync();
 
                 // 最小的BTN 这个时候再转为int 避免查询报错
-                var otherMinBTNCount= otherBTNStrList.Select(x => x.Answer.IsNullOrEmptyReturn0()).Min();
+                var othenMinBTNCount= otherBTNStrList.Select(x => x.Answer.IsNullOrEmptyReturn0()).Min();
-
-
-                // [(V3 - BTN - Min（V2 - BTN、V1 - BTN、BL - BTN）] 小于当0计算
-
-                var btnValue = thisBTN - otherMinBTNCount;
-
-                if (btnValue < 0)
-                {
-                    btnValue = 0;
-                }
 
                 // 历史有PD
                 if (pdTaskList.Count() > 0)
                 {
                     // 当前访视：自治疗后第二个访视点以来持续的新骨变数量 + [(V3 - BTN - Min（V2 - BTN、V1 - BTN、BL - BTN）] + 新病灶 >= 2
-
+                    if (thisNewBoneLesionsCount + thisBTN - othenMinBTNCount + thisNewLesionsCount >= 2)
-                    if (thisNewBoneLesionsCount + btnValue + thisNewLesionsCount >= 2)
                     {
                         result.IsPD = true;
                     }
@@ -1315,7 +1303,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                         // 按上面条件写三个if看着清晰点
                         if (lastNewLesionsCount + lastBTN - lastTwoBTN >= 2)
                         {
-                            if (thisNewBoneLesionsCount + btnValue + thisNewLesionsCount >= 2)
+                            if (thisNewBoneLesionsCount + thisBTN - othenMinBTNCount + thisNewLesionsCount >= 2)
                             {
                                 if (daysBetween >= 42)
                                 {