修改

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -7593,6 +7593,11 @@
             上一次任务的新病灶评估为iUPD
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.IRECISTNewLesionAssessmentDto.LastTaskNewLesioniCPD">
+            <summary>
+            上一次任务的新病灶评估为iCPD
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.IRECISTTargetLesionEvaluateDto">
             <summary>
             IRECIST整体肿瘤评估

IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs

@@ -276,6 +276,11 @@ namespace IRaCIS.Core.Application.ViewModel
         /// 上一次任务的新病灶评估为iUPD
         /// </summary>
         public bool LastTaskNewLesioniUPD { get; set; }
+
+        /// <summary>
+        /// 上一次任务的新病灶评估为iCPD
+        /// </summary>
+        public bool LastTaskNewLesioniCPD { get; set; }
     }
 
     /// <summary>

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

@@ -2343,6 +2343,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             {
                 //上一次任务的新病灶评估为iUPD
                 LastTaskNewLesioniUPD = lastTaskCalculateDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.NewLesionEvaluation && x.Answer.EqEnum(NewLesionAssessment.iUPD)),
+
+                //上一次任务的新病灶评估为iCPD
+                LastTaskNewLesioniCPD = lastTaskCalculateDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.NewLesionEvaluation && x.Answer.EqEnum(NewLesionAssessment.iCPD)),
             };
 
             // if(新靶病灶为ND&&新非靶病灶为ND&&其它既往新病灶为ND&&不存在触发iRECIST后新病灶） 
@@ -2362,7 +2365,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 result = NewLesionAssessment.iCPD;
             }
             // else if (前一访视新病灶评估为iCPD && (新靶病灶有存在病灶 || 新非靶病灶有存在状态病灶 || 其它既往新病灶有存在的病灶 || 触发iRECIST后新病灶有存在病灶))
-            else if(data.LastTaskNewLesioniUPD&&
+            else if(data.LastTaskNewLesioniCPD &&
                 (inDto.QuestionInfo.Where(x => x.LesionType == LesionType.NewTargetLesion).SelectMany(x => x.TableRowInfoList).Count() > 0
                 || inDto.QuestionInfo.Where(x => x.LesionType == LesionType.NewNonTargetLesion).SelectMany(x => x.TableRowInfoList).Count() > 0
                 || inDto.QuestionInfo.Where(x => x.LesionType == LesionType.OtherPreviousNewLesion).SelectMany(x => x.TableRowInfoList).Count() > 0