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

修改合并bug
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-10-25 18:01:28 +08:00
parent 792a4235d2
commit 2a172acb15
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
View File

@ -2117,8 +2117,7 @@ namespace IRaCIS.Core.Application.Service.Common
foreach (var item in list) foreach (var item in list)
{ {
//处理合并表头 //处理合并表头
if (list.IndexOf(item) == 0)
{
var questionType = item.IsBaseline == true ? QuestionType.ExistDisease : QuestionType.Tumor; var questionType = item.IsBaseline == true ? QuestionType.ExistDisease : QuestionType.Tumor;
var findItem = item.QuestionAnswerList.Where(t => t.QuestionType == questionType).FirstOrDefault(); var findItem = item.QuestionAnswerList.Where(t => t.QuestionType == questionType).FirstOrDefault();
@ -2128,7 +2127,6 @@ namespace IRaCIS.Core.Application.Service.Common
findItem.QuestionName = _userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估"; findItem.QuestionName = _userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估";
} }
}
if (item.IsBaseline == true) if (item.IsBaseline == true)
{ {
@ -2146,8 +2144,7 @@ namespace IRaCIS.Core.Application.Service.Common
foreach (var item in list) foreach (var item in list)
{ {
//处理合并表头 //处理合并表头
if (list.IndexOf(item) == 0)
{
var questionType = item.IsBaseline == true ? QuestionType.ExistDisease : QuestionType.ImgOncology; var questionType = item.IsBaseline == true ? QuestionType.ExistDisease : QuestionType.ImgOncology;
var findItem = item.QuestionAnswerList.Where(t => t.QuestionType == questionType).FirstOrDefault(); var findItem = item.QuestionAnswerList.Where(t => t.QuestionType == questionType).FirstOrDefault();
@ -2156,7 +2153,6 @@ namespace IRaCIS.Core.Application.Service.Common
{ {
findItem.QuestionName = _userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估"; findItem.QuestionName = _userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估";
} }
}
if (item.IsBaseline == true) if (item.IsBaseline == true)
{ {