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

IRC_NewDev
he 2024-10-22 15:25:08 +08:00
commit 2bad8065a5
1 changed files with 15 additions and 2 deletions

View File

@ -1591,13 +1591,19 @@ namespace IRaCIS.Core.Application.Service.Common
//评估病灶明细 //评估病灶明细
DetailedOfEvaluatedLesion = 3, DetailedOfEvaluatedLesion = 3,
//阅片结果
CommonReading_Export = 4, CommonReading_Export = 4,
//阅片结果明细
CommonReadingDetail_Export = 5, CommonReadingDetail_Export = 5,
//裁判阅片明细
CommonJudgeReadingDetail_Export = 6, CommonJudgeReadingDetail_Export = 6,
//访视一致率
VisitJudgeRatio_Export = 7, VisitJudgeRatio_Export = 7,
//阅片期一致率
ReadingPeriodJudgeRatio_Export = 8, ReadingPeriodJudgeRatio_Export = 8,
} }
@ -2214,9 +2220,13 @@ namespace IRaCIS.Core.Application.Service.Common
var findItem = item.QuestionAnswerList.Where(t => t.QuestionType == questionType).FirstOrDefault(); var findItem = item.QuestionAnswerList.Where(t => t.QuestionType == questionType).FirstOrDefault();
if (findItem != null)
{
findItem.QuestionName = _userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估"; findItem.QuestionName = _userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估";
} }
}
if (item.IsBaseline == true) if (item.IsBaseline == true)
{ {
item.QuestionAnswerList = item.QuestionAnswerList.Where(t => t.QuestionType != QuestionType.Tumor).ToList(); item.QuestionAnswerList = item.QuestionAnswerList.Where(t => t.QuestionType != QuestionType.Tumor).ToList();
@ -2239,8 +2249,11 @@ namespace IRaCIS.Core.Application.Service.Common
var findItem = item.QuestionAnswerList.Where(t => t.QuestionType == questionType).FirstOrDefault(); var findItem = item.QuestionAnswerList.Where(t => t.QuestionType == questionType).FirstOrDefault();
if (findItem != null)
{
findItem.QuestionName = _userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估"; findItem.QuestionName = _userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估";
} }
}
if (item.IsBaseline == true) if (item.IsBaseline == true)
{ {