修改被评估为NE的单个靶病灶

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

@@ -1110,7 +1110,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 return ExistOrNA.NA.GetEnumInt();
             }
 
-            var result = inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.TargetLesion && x.Answer.EqEnum(TargetAssessment.NE));
+            var result = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).SelectMany(x => x.TableRowInfoList).ToList().Any(x => x.TableQuestionList.Any(y =>
+             y.QuestionMark == QuestionMark.State && y.Answer.EqEnum(TargetState.UnableEvaluate)));
 
             return result ? ExistOrNA.Exist.GetEnumInt() : ExistOrNA.NotExist.GetEnumInt();
         }

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

@@ -1563,7 +1563,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 return ExistOrNA.NA.GetEnumInt();
             }
 
-            var result = inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.TargetLesion && x.Answer.EqEnum(TargetAssessment.NE));
+            var result = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).SelectMany(x => x.TableRowInfoList).ToList().Any(x => x.TableQuestionList.Any(y =>
+           y.QuestionMark == QuestionMark.State && y.Answer.EqEnum(TargetState.UnableEvaluate)));
 
             return result ? ExistOrNA.Exist.GetEnumInt() : ExistOrNA.NotExist.GetEnumInt();
         }

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

@@ -1563,7 +1563,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 return ExistOrNA.NA.GetEnumInt();
             }
 
-            var result = inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.TargetLesion && x.Answer.EqEnum(TargetAssessment.NE));
+            var result = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).SelectMany(x => x.TableRowInfoList).ToList().Any(x => x.TableQuestionList.Any(y =>
+           y.QuestionMark == QuestionMark.State && y.Answer.EqEnum(TargetState.UnableEvaluate)));
 
             return result ? ExistOrNA.Exist.GetEnumInt() : ExistOrNA.NotExist.GetEnumInt();
         }

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

@@ -1070,7 +1070,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 return ExistOrNA.NA.GetEnumInt();
             }
 
-            var result = inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.TargetLesion && x.Answer.EqEnum(TargetAssessment.NE));
+            var result = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).SelectMany(x => x.TableRowInfoList).ToList().Any(x => x.TableQuestionList.Any(y =>
+           y.QuestionMark == QuestionMark.State && y.Answer.EqEnum(TargetState.UnableEvaluate)));
 
             return result ? ExistOrNA.Exist.GetEnumInt() : ExistOrNA.NotExist.GetEnumInt();
         }

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

@@ -912,7 +912,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 return ExistOrNA.NA.GetEnumInt();
             }
 
-            var result = inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.TargetLesion && x.Answer.EqEnum(TargetAssessment.NE));
+
+            var result = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).SelectMany(x => x.TableRowInfoList).ToList().Any(x => x.TableQuestionList.Any(y =>
+            y.QuestionMark == QuestionMark.State && y.Answer.EqEnum(TargetState.UnableEvaluate)));
+
 
             return result ? ExistOrNA.Exist.GetEnumInt() : ExistOrNA.NotExist.GetEnumInt();
         }

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

@@ -912,7 +912,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 return ExistOrNA.NA.GetEnumInt();
             }
 
-            var result = inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.TargetLesion && x.Answer.EqEnum(TargetAssessment.NE));
+            var result = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).SelectMany(x => x.TableRowInfoList).ToList().Any(x => x.TableQuestionList.Any(y =>
+            y.QuestionMark == QuestionMark.State && y.Answer.EqEnum(TargetState.UnableEvaluate)));
 
             return result ? ExistOrNA.Exist.GetEnumInt() : ExistOrNA.NotExist.GetEnumInt();
         }