XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
he 2025-06-20 16:46:25 +08:00
parent 139e1f8186 81cb43d3a3
commit 1d8be8c04b
1 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
View File

@ -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)