From 506567278656d1f5d2b69fc00276d2a5e4907d21 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Wed, 13 Mar 2024 10:14:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=97=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../评估算法/6、CMRI总体评估实现代码.cs       | 378 ++++++++++--------
 1 file changed, 205 insertions(+), 173 deletions(-)

diff --git a/Lugano 2014/评估算法/6、CMRI总体评估实现代码.cs b/Lugano 2014/评估算法/6、CMRI总体评估实现代码.cs
index ea3812d..9adfea9 100644
--- a/Lugano 2014/评估算法/6、CMRI总体评估实现代码.cs	
+++ b/Lugano 2014/评估算法/6、CMRI总体评估实现代码.cs	
@@ -19,179 +19,211 @@ public async Task<string> CTMRIEvaluation(ReadingCalculateDto inDto)
             // 脾脏评估
             var spleenEvaluation = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.SplenicEvaluation).Select(x => x.Answer).FirstOrDefault();
      
-            List<CalculationDto> data = new List<CalculationDto>() {
-
-                //ND	ND	否/疑似	 正常	正常	ND
-                new CalculationDto(){
-                Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.ND }),
-                Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.ND }),
-                Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.No, NewLesionAssessment.Suspected }),
-                Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.Normal }),
-                Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Normal }),
-                Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.ND }),
-                },
-
-                //PD  任一结果    任一结果    任一结果    任一结果    PD
-                new CalculationDto(){
-                Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.PD }),
-                Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() {  }),
-                Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { }),
-                Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() {  }),
-                Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { }),
-                Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PD }),
-                },
-                //任一结果	PD	任一结果	任一结果	任一结果	PD
-                new CalculationDto(){
-                Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() {  }),
-                Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.PD }),
-                Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() {}),
-                Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() {  }),
-                Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { }),
-                Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PD }),
-                },
-                //任一结果  任一结果    是   任一结果    任一结果    PD
-                new CalculationDto(){
-                Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { }),
-                Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() {  }),
-                Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.Yes }),
-                Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { }),
-                Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() {  }),
-                Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PD }),
-                },
-                //任一结果	任一结果	任一结果	显著增大	任一结果	PD
-                new CalculationDto(){
-                Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() {  }),
-                Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { }),
-                Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() {  }),
-                Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.Increase }),
-                Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() {  }),
-                Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PD }),
-                },
-                //任一结果    任一结果    任一结果    任一结果    显著增大    PD
-                new CalculationDto(){
-                Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() {  }),
-                Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { }),
-                Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() {}),
-                Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() {  }),
-                Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Increase }),
-                Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PD }),
-                },
-                //CR	CR/ND	否	正常	正常	CR
-                new CalculationDto(){
-                Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.CR }),
-                Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.CR, NoTargetAssessment.ND }),
-                Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.No }),
-                Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.Normal }),
-                Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Normal }),
-                Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.CR }),
-                },
-                //ND  CR  否   正常  正常  CR
-                new CalculationDto(){
-                Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.ND }),
-                Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.CR }),
-                Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.No }),
-                Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.Normal }),
-                Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Normal }),
-                Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.CR }),
-                },
-                //NE	非PD	否/疑似/无法评估 	 非显著增大	非显著增大	NE
-                new CalculationDto(){
-                NotEq=new List<int>(){ 2,4,5},
-                Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.NE }),
-                Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.PD }),
-                Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.No,NewLesionAssessment.Suspected, NewLesionAssessment.NE}),
-                Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.Increase }),
-                Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Increase }),
-                Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.NE }),
-                },
-                //ND  NE  否/疑似/无法评估（不为是）	正常/稳定/无法评估/部分缓解（非显著增大）	正常/稳定/无法评估/部分缓解（非显著增大）	NE
-                new CalculationDto(){
-                NotEq=new List<int>(){ 3,4,5},
-                Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.ND }),
-                Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.NE }),
-                Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.Yes }),
-                Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.Increase }),
-                Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Increase }),
-                Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.NE }),
-                },
-                //ND  ND  无法评估   正常/稳定/无法评估/部分缓解（非显著增大）	正常/稳定/无法评估/部分缓解（非显著增大）	NE
-                new CalculationDto(){
-                NotEq=new List<int>(){ 4,5},
-                Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.ND }),
-                Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.ND }),
-                Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.NE }),
-                Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.Increase }),
-                Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Increase }),
-                Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.NE }),
-                },
-                //ND	ND	否/疑似  	无法评估	正常/稳定/无法评估/部分缓解（非显著增大）	NE
-                new CalculationDto(){
-                NotEq=new List<int>(){ 5},
-                Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.ND }),
-                Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.ND }),
-                Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.No,NewLesionAssessment.Suspected }),
-                Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.NotEvaluable }),
-                Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Increase }),
-                Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.NE }),
-                },
-                // ND	ND	否/疑似	正常/稳定	NE	NE
-                new CalculationDto(){
-                Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.ND }),
-                Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.ND }),
-                Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.No,NewLesionAssessment.Suspected }),
-                Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.Normal,LiverAssessment.Stabilization }),
-                Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.NotEvaluable }),
-                Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.NE }),
-                },
-                //PR  非PD 否/疑似/无法评估（不为是）	正常/稳定   正常/部分缓解 PR
-                new CalculationDto(){
-                NotEq=new List<int>(){ 2,3},
-                Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.PR }),
-                Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.PD }),
-                Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.Yes }),
-                Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.Normal,LiverAssessment.Stabilization}),
-                Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Normal,SpleenAssessment.Remission }),
-                Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PR }),
-                },
-                //CR	（PR/SD）或者NE	 否/疑似/无法评估（不为是）	正常/部分缓解	正常/部分缓解	PR
-                  new CalculationDto(){
-                NotEq=new List<int>(){ 3},
-                Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.CR }),
-                Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.PRSD,NoTargetAssessment.NE }),
-                Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.Yes,NewLesionAssessment.Yes }),
-                Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.Normal,LiverAssessment.Stabilization}),
-                Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Normal,SpleenAssessment.Remission }),
-                Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PR }),
-                },
-                  //CR	CR/ND	疑似/无法评估	正常/稳定	正常/部分缓解	PR
-                    new CalculationDto(){
-
-                Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.CR }),
-                Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.CR,NoTargetAssessment.ND }),
-                Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.Suspected, NewLesionAssessment.NE  }),
-                Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.Normal,LiverAssessment.Stabilization}),
-                Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Normal,SpleenAssessment.Remission }),
-                Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PR }),
-                },
-                 //   ND  CR  疑似/无法评估 正常/稳定   正常/部分缓解 PR
-                      new CalculationDto(){
-
-                Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.ND }),
-                Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.CR }),
-                Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() {  NewLesionAssessment.Suspected, NewLesionAssessment.NE }),
-                Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.Normal,LiverAssessment.Stabilization}),
-                Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Normal,SpleenAssessment.Remission }),
-                Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PR }),
-                },
-                 new CalculationDto(){
-                Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() {  }),
-                Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { }),
-                Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { }),
-                Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { }),
-                Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() {  }),
-                Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.SD }),
-                },
-            };
+          List<CalculationDto> data = new List<CalculationDto>() {
+           
+               //ND	ND	否/疑似	 正常	正常	ND
+               new CalculationDto(){
+           	Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.ND }),
+           	Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.ND }),
+           	Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.No, NewLesionAssessment.Suspected }),
+           	Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.Normal }),
+           	Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Normal }),
+           	Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.ND }),
+           	},
+           
+               //PD  任一结果    任一结果    任一结果    任一结果    PD
+               new CalculationDto(){
+           	Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.PD }),
+           	Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() {  }),
+           	Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { }),
+           	Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() {  }),
+           	Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { }),
+           	Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PD }),
+           	},
+               //任一结果	PD	任一结果	任一结果	任一结果	PD
+               new CalculationDto(){
+           	Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() {  }),
+           	Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.PD }),
+           	Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() {}),
+           	Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() {  }),
+           	Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { }),
+           	Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PD }),
+           	},
+               //任一结果  任一结果    是   任一结果    任一结果    PD
+               new CalculationDto(){
+           	Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { }),
+           	Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() {  }),
+           	Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.Yes }),
+           	Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { }),
+           	Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() {  }),
+           	Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PD }),
+           	},
+               //任一结果	任一结果	任一结果	显著增大	任一结果	PD
+               new CalculationDto(){
+           	Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() {  }),
+           	Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { }),
+           	Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() {  }),
+           	Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.Increase }),
+           	Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() {  }),
+           	Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PD }),
+           	},
+               //任一结果    任一结果    任一结果    任一结果    显著增大    PD
+               new CalculationDto(){
+           	Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() {  }),
+           	Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { }),
+           	Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() {}),
+           	Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() {  }),
+           	Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Increase }),
+           	Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PD }),
+           	},
+               //CR	CR/ND	否	正常	正常	CR
+               new CalculationDto(){
+           	Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.CR }),
+           	Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.CR, NoTargetAssessment.ND }),
+           	Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.No }),
+           	Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.Normal }),
+           	Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Normal }),
+           	Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.CR }),
+           	},
+               //ND  CR  否   正常  正常  CR
+               new CalculationDto(){
+           	Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.ND }),
+           	Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.CR }),
+           	Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.No }),
+           	Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.Normal }),
+           	Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Normal }),
+           	Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.CR }),
+           	},
+               //NE	非PD	否/疑似/无法评估 	 非显著增大	非显著增大	NE
+               new CalculationDto(){
+           	NotEq=new List<int>(){ 2,4,5},
+           	Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.NE }),
+           	Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.PD }),
+           	Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.No,NewLesionAssessment.Suspected, NewLesionAssessment.NE}),
+           	Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.Increase }),
+           	Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Increase }),
+           	Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.NE }),
+           	},
+               //ND  NE  否/疑似/无法评估（不为是）	正常/稳定/无法评估/部分缓解（非显著增大）	正常/稳定/无法评估/部分缓解（非显著增大）	NE
+               new CalculationDto(){
+           	NotEq=new List<int>(){ 3,4,5},
+           	Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.ND }),
+           	Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.NE }),
+           	Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.Yes }),
+           	Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.Increase }),
+           	Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Increase }),
+           	Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.NE }),
+           	},
+               //ND  ND  无法评估   正常/稳定/无法评估/部分缓解（非显著增大）	正常/稳定/无法评估/部分缓解（非显著增大）	NE
+               new CalculationDto(){
+           	NotEq=new List<int>(){ 4,5},
+           	Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.ND }),
+           	Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.ND }),
+           	Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.NE }),
+           	Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.Increase }),
+           	Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Increase }),
+           	Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.NE }),
+           	},
+               //ND	ND	否/疑似  	无法评估	正常/稳定/无法评估/部分缓解（非显著增大）	NE
+               new CalculationDto(){
+           	NotEq=new List<int>(){ 5},
+           	Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.ND }),
+           	Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.ND }),
+           	Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.No,NewLesionAssessment.Suspected }),
+           	Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.NotEvaluable }),
+           	Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Increase }),
+           	Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.NE }),
+           	},
+               // ND	ND	否/疑似	正常/稳定	NE	NE
+               new CalculationDto(){
+           	Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.ND }),
+           	Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.ND }),
+           	Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.No,NewLesionAssessment.Suspected }),
+           	Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.Normal,LiverAssessment.Stabilization }),
+           	Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.NotEvaluable }),
+           	Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.NE }),
+           	},
+               //1 PR  CR或PR/SD或NE或ND  否/疑似/无法评估NE	  正常/稳定/NE    正常/部分缓解/稳定/NE     PR
+               new CalculationDto(){
+           	Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.PR }),
+           	Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.CR,NoTargetAssessment.PRSD,NoTargetAssessment.NE,NoTargetAssessment.ND }),
+           	Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.No,NewLesionAssessment.Suspected,NewLesionAssessment.NE }),
+           	Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.Normal,LiverAssessment.Stabilization,LiverAssessment.NotEvaluable}),
+           	Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Normal,SpleenAssessment.Remission,SpleenAssessment.Stabilization,SpleenAssessment.NotEvaluable }),
+           	Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PR }),
+           	},
+               //2 CR	（PR/SD）或者NE	 否/疑似/无法评估	正常/稳定/NE	正常/部分缓解/稳定/NE	PR
+               new CalculationDto(){
+           	Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.CR }),
+           	Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.PRSD,NoTargetAssessment.NE }),
+           	Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.No,NewLesionAssessment.Suspected ,NewLesionAssessment.NE}),
+           	Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.Normal,LiverAssessment.Stabilization,LiverAssessment.NotEvaluable}),
+           	Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Normal,SpleenAssessment.Remission ,SpleenAssessment.Stabilization,SpleenAssessment.NotEvaluable}),
+           	Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PR }),
+           	},
+                 //3 CR	CR/ND	疑似/无法评估	正常/稳定/NE	正常/部分缓解/稳定/NE	PR
+               new CalculationDto(){
+           	Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.CR }),
+           	Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.CR,NoTargetAssessment.ND }),
+           	Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.Suspected, NewLesionAssessment.NE  }),
+           	Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.Normal,LiverAssessment.Stabilization,LiverAssessment.NotEvaluable}),
+           	Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Normal,SpleenAssessment.Remission ,SpleenAssessment.Stabilization,SpleenAssessment.NotEvaluable }),
+           	Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PR }),
+           	},
+                //4  CR	CR/ND	否	稳定/NE	  正常/部分缓解/稳定/NE  	PR
+               new CalculationDto(){
+           	Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.CR }),
+           	Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.CR,NoTargetAssessment.ND }),
+           	Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.No  }),
+           	Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() {LiverAssessment.Stabilization,LiverAssessment.NotEvaluable}),
+           	Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Normal,SpleenAssessment.Remission ,SpleenAssessment.Stabilization,SpleenAssessment.NotEvaluable }),
+           	Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PR }),
+           	},
+                //5  CR	CR/ND	否	正常	 部分缓解/稳定/NE  	PR
+               new CalculationDto(){
+           	Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.CR }),
+           	Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.CR,NoTargetAssessment.ND }),
+           	Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.No  }),
+           	Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() {LiverAssessment.Normal}),
+           	Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Remission ,SpleenAssessment.Stabilization,SpleenAssessment.NotEvaluable }),
+           	Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PR }),
+           	},
+                // 6  ND  CR  疑似/无法评估 正常/稳定/NE   正常/部分缓解/稳定/NE  PR
+               new CalculationDto(){
+           	Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.ND }),
+           	Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.CR }),
+           	Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() {  NewLesionAssessment.Suspected, NewLesionAssessment.NE }),
+           	Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.Normal,LiverAssessment.Stabilization,LiverAssessment.NotEvaluable}),
+           	Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Normal,SpleenAssessment.Remission,SpleenAssessment.Stabilization,SpleenAssessment.NotEvaluable }),
+           	Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PR }),
+           	},
+                  // 7  ND  CR  否  稳定/NE   正常/部分缓解/稳定/NE  PR
+               new CalculationDto(){
+           	Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.ND }),
+           	Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.CR }),
+           	Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() {  NewLesionAssessment.No }),
+           	Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() {LiverAssessment.Stabilization,LiverAssessment.NotEvaluable}),
+           	Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Normal,SpleenAssessment.Remission,SpleenAssessment.Stabilization,SpleenAssessment.NotEvaluable }),
+           	Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PR }),
+           	},
+                   // 8  ND  CR  否  正常  部分缓解/稳定/NE  PR
+               new CalculationDto(){
+           	Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.ND }),
+           	Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.CR }),
+           	Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() {  NewLesionAssessment.No }),
+           	Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() {LiverAssessment.Normal}),
+           	Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Remission,SpleenAssessment.Stabilization,SpleenAssessment.NotEvaluable }),
+           	Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PR }),
+           	},
+           	 new CalculationDto(){
+           	Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() {  }),
+           	Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { }),
+           	Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { }),
+           	Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { }),
+           	Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() {  }),
+           	Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.SD }),
+           	},
+           };
 
             var index= data.FindIndex(x =>
              (x.NotEq.Contains(1) ? !x.Column1.Contains(targetEvaluation) : x.Column1.Contains(targetEvaluation) || x.Column1.Count() == 0) &&