From 81cb43d3a3845f3f0ce8789a0726a1272f3bd546 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 20 Jun 2025 16:21:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9PD=20=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Document/TrialEmailNoticeConfigService.cs | 57 +++++++++++++++----
 1 file changed, 45 insertions(+), 12 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
index 34afa94ea..2d1f68fd4 100644
--- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
@@ -1327,6 +1327,14 @@ namespace IRaCIS.Core.Application.Service
                     {
                         answer = _userInfo.IsEn_Us ? "Yes" : "是";
                     }
+                    else if (answer == OverallAssessment.ND.GetEnumInt())
+                    {
+                        answer = "ND";
+                    }
+                    else if (answer == OverallAssessment.NE.GetEnumInt())
+                    {
+                        answer = "NE";
+                    }
                     else
                     {
                         answer = _userInfo.IsEn_Us ? "No" : "否";
@@ -1339,6 +1347,34 @@ namespace IRaCIS.Core.Application.Service
                     {
                         answer = _userInfo.IsEn_Us ? "Yes" : "是";
                     }
+                    else if (answer == OverallAssessment.ND.GetEnumInt())
+                    {
+                        answer = "ND";
+                    }
+                    else if (answer == OverallAssessment.NE.GetEnumInt())
+                    {
+                        answer = "NE";
+                    }
+                    else
+                    {
+                        answer = _userInfo.IsEn_Us ? "No" : "否";
+                    }
+
+                    break;
+                case CriterionType.Lugano2014WithoutPET:
+
+                    if (answer == CTMRIOverallAssessment.PD.GetEnumInt())
+                    {
+                        answer = _userInfo.IsEn_Us ? "Yes" : "是";
+                    }
+                    else if (answer == CTMRIOverallAssessment.ND.GetEnumInt())
+                    {
+                        answer = "ND";
+                    }
+                    else if (answer == CTMRIOverallAssessment.NE.GetEnumInt())
+                    {
+                        answer = "NE";
+                    }
                     else
                     {
                         answer = _userInfo.IsEn_Us ? "No" : "否";
@@ -1351,18 +1387,13 @@ namespace IRaCIS.Core.Application.Service
                     {
                         answer = _userInfo.IsEn_Us ? "Yes" : "是";
                     }
-                    else
+                    else if (answer == ImagingOverallAssessment_Lugano.ND.GetEnumInt())
                     {
-                        answer = _userInfo.IsEn_Us ? "No" : "否";
+                        answer = "ND";
                     }
-
-                    break;
-
-                case CriterionType.Lugano2014WithoutPET:
-
-                    if (answer == CTMRIOverallAssessment.PD.GetEnumInt())
+                    else if (answer == ImagingOverallAssessment_Lugano.NE.GetEnumInt())
                     {
-                        answer = _userInfo.IsEn_Us ? "Yes" : "是";
+                        answer = "NE";
                     }
                     else
                     {
@@ -1371,17 +1402,19 @@ namespace IRaCIS.Core.Application.Service
 
                     break;
 
+
+
                 case CriterionType.PCWG3:
 
                     if (answer == VisitTumorEvaluation.PD.GetEnumInt())
                     {
                         answer = _userInfo.IsEn_Us ? "Yes" : "是";
                     }
-                    if (answer == VisitTumorEvaluation.ND.GetEnumInt())
+                    else if (answer == VisitTumorEvaluation.ND.GetEnumInt())
                     {
                         answer = "ND";
                     }
-                    if (answer == VisitTumorEvaluation.NE.GetEnumInt())
+                    else if (answer == VisitTumorEvaluation.NE.GetEnumInt())
                     {
                         answer = "NE";
                     }
@@ -1626,7 +1659,7 @@ namespace IRaCIS.Core.Application.Service
             var trialEmailNoticeConfigQueryable = _trialEmailNoticeConfigRepository.Where(t => t.TrialId == inQuery.TrialId)
               .WhereIf(inQuery.IsDistinguishCriteria == false, t => t.IsDistinguishCriteria == false)
               .WhereIf(inQuery.IsDistinguishCriteria == true, t => t.IsDistinguishCriteria == true)
-              .WhereIf(inQuery.CriterionTypeEnum != null, t => t.CriterionTypeList.Any(c=>c==inQuery.CriterionTypeEnum))
+              .WhereIf(inQuery.CriterionTypeEnum != null, t => t.CriterionTypeList.Any(c => c == inQuery.CriterionTypeEnum))
               .WhereIf(inQuery.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == inQuery.BusinessScenarioEnum)
               .WhereIf(inQuery.EmailUrgentEnum != null, t => t.EmailUrgentEnum == inQuery.EmailUrgentEnum)
               .WhereIf(inQuery.IsEnable != null, t => t.IsEnable == inQuery.IsEnable)