From ae40f36853a80f2ec5241fc281694788f7e64041 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 6 Sep 2023 15:49:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LuganoCalculateService.cs                 | 216 +++++++++---------
 1 file changed, 108 insertions(+), 108 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
index 9a71f14db..de3cb1d75 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
@@ -1739,173 +1739,173 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                 //ND	ND	否/疑似	 正常	正常	ND
                 new CalculationDto(){
-                Column1=EnumToString(new List<TargetAssessment>() { TargetAssessment.ND }),
-                Column2=EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.ND }),
-                Column3=EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.No,NewLesionAssessment.Suspected }),
-                Column4=EnumToString(new List<LiverAssessment>() { LiverAssessment.Normal }),
-                Column5=EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Normal }),
-                Column6=EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.ND }),
+                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=EnumToString(new List<TargetAssessment>() { TargetAssessment.PD }),
-                Column2=EnumToString(new List<NoTargetAssessment>() {  }),
-                Column3=EnumToString(new List<NewLesionAssessment>() { }),
-                Column4=EnumToString(new List<LiverAssessment>() {  }),
-                Column5=EnumToString(new List<SpleenAssessment>() { }),
-                Column6=EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PD }),
+                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=EnumToString(new List<TargetAssessment>() {  }),
-                Column2=EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.PD }),
-                Column3=EnumToString(new List<NewLesionAssessment>() {}),
-                Column4=EnumToString(new List<LiverAssessment>() {  }),
-                Column5=EnumToString(new List<SpleenAssessment>() { }),
-                Column6=EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PD }),
+                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  任一结果    是   任一结果    任一结果    PD
                 new CalculationDto(){
-                Column1=EnumToString(new List<TargetAssessment>() { TargetAssessment.PD }),
-                Column2=EnumToString(new List<NoTargetAssessment>() {  }),
-                Column3=EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.Yes }),
-                Column4=EnumToString(new List<LiverAssessment>() { }),
-                Column5=EnumToString(new List<SpleenAssessment>() {  }),
-                Column6=EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.ND }),
+                Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.PD }),
+                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.ND }),
                 },
                 //任一结果	任一结果	任一结果	显著增大	任一结果	PD
                 new CalculationDto(){
-                Column1=EnumToString(new List<TargetAssessment>() {  }),
-                Column2=EnumToString(new List<NoTargetAssessment>() { }),
-                Column3=EnumToString(new List<NewLesionAssessment>() {  }),
-                Column4=EnumToString(new List<LiverAssessment>() { LiverAssessment.Increase }),
-                Column5=EnumToString(new List<SpleenAssessment>() {  }),
-                Column6=EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.ND }),
+                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.ND }),
                 },
                 //任一结果    任一结果    任一结果    任一结果    显著增大    PD
                 new CalculationDto(){
-                Column1=EnumToString(new List<TargetAssessment>() {  }),
-                Column2=EnumToString(new List<NoTargetAssessment>() { }),
-                Column3=EnumToString(new List<NewLesionAssessment>() {}),
-                Column4=EnumToString(new List<LiverAssessment>() {  }),
-                Column5=EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Increase }),
-                Column6=EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.ND }),
+                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.ND }),
                 },
                 //CR	CR/ND	否	正常	正常	CR
                 new CalculationDto(){
-                Column1=EnumToString(new List<TargetAssessment>() { TargetAssessment.CR }),
-                Column2=EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.CR, NoTargetAssessment.ND }),
-                Column3=EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.No }),
-                Column4=EnumToString(new List<LiverAssessment>() { LiverAssessment.Normal }),
-                Column5=EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Normal }),
-                Column6=EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.CR }),
+                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=EnumToString(new List<TargetAssessment>() { TargetAssessment.ND }),
-                Column2=EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.CR }),
-                Column3=EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.No }),
-                Column4=EnumToString(new List<LiverAssessment>() { LiverAssessment.Normal }),
-                Column5=EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Normal }),
-                Column6=EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.CR }),
+                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},
-                Column1=EnumToString(new List<TargetAssessment>() { TargetAssessment.NE }),
-                Column2=EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.PD }),
-                Column3=EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.No,NewLesionAssessment.Suspected, NewLesionAssessment.NE}),
-                Column4=EnumToString(new List<LiverAssessment>() { LiverAssessment.Increase }),
-                Column5=EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Increase }),
-                Column6=EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.NE }),
+                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=EnumToString(new List<TargetAssessment>() { TargetAssessment.ND }),
-                Column2=EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.NE }),
-                Column3=EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.Yes }),
-                Column4=EnumToString(new List<LiverAssessment>() { LiverAssessment.Increase }),
-                Column5=EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Increase }),
-                Column6=EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.NE }),
+                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=EnumToString(new List<TargetAssessment>() { TargetAssessment.ND }),
-                Column2=EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.ND }),
-                Column3=EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.NE }),
-                Column4=EnumToString(new List<LiverAssessment>() { LiverAssessment.Increase }),
-                Column5=EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Increase }),
-                Column6=EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.NE }),
+                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>(){ 4},
-                Column1=EnumToString(new List<TargetAssessment>() { TargetAssessment.ND }),
-                Column2=EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.ND }),
-                Column3=EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.No,NewLesionAssessment.Suspected }),
-                Column4=EnumToString(new List<LiverAssessment>() { LiverAssessment.NotEvaluable }),
-                Column5=EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Increase }),
-                Column6=EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.NE }),
+                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=EnumToString(new List<TargetAssessment>() { TargetAssessment.ND }),
-                Column2=EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.ND }),
-                Column3=EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.No,NewLesionAssessment.Suspected }),
-                Column4=EnumToString(new List<LiverAssessment>() { LiverAssessment.Normal,LiverAssessment.Stabilization }),
-                Column5=EnumToString(new List<SpleenAssessment>() { SpleenAssessment.NotEvaluable }),
-                Column6=EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.NE }),
+                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=EnumToString(new List<TargetAssessment>() { TargetAssessment.PR }),
-                Column2=EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.PD }),
-                Column3=EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.Yes }),
-                Column4=EnumToString(new List<LiverAssessment>() { LiverAssessment.Normal,LiverAssessment.Stabilization}),
-                Column5=EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Normal,SpleenAssessment.Remission }),
-                Column6=EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PR }),
+                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=EnumToString(new List<TargetAssessment>() { TargetAssessment.CR }),
-                Column2=EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.PRSD,NoTargetAssessment.NE }),
-                Column3=EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.Yes,NewLesionAssessment.Yes }),
-                Column4=EnumToString(new List<LiverAssessment>() { LiverAssessment.Normal,LiverAssessment.Stabilization}),
-                Column5=EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Normal,SpleenAssessment.Remission }),
-                Column6=EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PR }),
+                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=EnumToString(new List<TargetAssessment>() { TargetAssessment.CR }),
-                Column2=EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.CR,NoTargetAssessment.ND }),
-                Column3=EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.Suspected, NewLesionAssessment.NE  }),
-                Column4=EnumToString(new List<LiverAssessment>() { LiverAssessment.Normal,LiverAssessment.Stabilization}),
-                Column5=EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Normal,SpleenAssessment.Remission }),
-                Column6=EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PR }),
+                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=EnumToString(new List<TargetAssessment>() { TargetAssessment.ND }),
-                Column2=EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.CR }),
-                Column3=EnumToString(new List<NewLesionAssessment>() {  NewLesionAssessment.Suspected, NewLesionAssessment.NE }),
-                Column4=EnumToString(new List<LiverAssessment>() { LiverAssessment.Normal,LiverAssessment.Stabilization}),
-                Column5=EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Normal,SpleenAssessment.Remission }),
-                Column6=EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.PR }),
+                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=EnumToString(new List<TargetAssessment>() {  }),
-                Column2=EnumToString(new List<NoTargetAssessment>() { }),
-                Column3=EnumToString(new List<NewLesionAssessment>() { }),
-                Column4=EnumToString(new List<LiverAssessment>() { }),
-                Column5=EnumToString(new List<SpleenAssessment>() {  }),
-                Column6=EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.SD }),
+                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 }),
                 },
             };