From cfce8dba1fb15e82900622a919ea2c8992e1cb41 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Wed, 13 Mar 2024 10:12:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E7=AE=97CTMRI=20=E6=80=BB=E4=BD=93?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LuganoCalculateService.cs                 | 76 +++++++++++++------
 1 file changed, 54 insertions(+), 22 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
index 9415121fe..80e5965e9 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
@@ -3307,44 +3307,76 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 				Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.NotEvaluable }),
 				Column6=ReadingCommon.EnumToString(new List<CTMRIOverallAssessment>() { CTMRIOverallAssessment.NE }),
 				},
-                //PR  非PD 否/疑似/无法评估（不为是）	正常/稳定   正常/部分缓解 PR
+                //1 PR  CR或PR/SD或NE或ND  否/疑似/无法评估NE	  正常/稳定/NE    正常/部分缓解/稳定/NE     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 }),
+				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 }),
 				},
-                //CR	（PR/SD）或者NE	 否/疑似/无法评估（不为是）	正常/部分缓解	正常/部分缓解	PR
-                  new CalculationDto(){
-				NotEq=new List<int>(){ 3},
+                //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.Yes,NewLesionAssessment.Yes }),
-				Column4=ReadingCommon.EnumToString(new List<LiverAssessment>() { LiverAssessment.Normal,LiverAssessment.Stabilization}),
-				Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Normal,SpleenAssessment.Remission }),
+				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 }),
 				},
-                  //CR	CR/ND	疑似/无法评估	正常/稳定	正常/部分缓解	PR
-                    new CalculationDto(){
-
+                  //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}),
-				Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Normal,SpleenAssessment.Remission }),
+				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 }),
 				},
-                 //   ND  CR  疑似/无法评估 正常/稳定   正常/部分缓解 PR
-                      new CalculationDto(){
-
+                 //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}),
-				Column5=ReadingCommon.EnumToString(new List<SpleenAssessment>() { SpleenAssessment.Normal,SpleenAssessment.Remission }),
+				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(){