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

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

@ -1644,13 +1644,13 @@ namespace IRaCIS.Core.Application.Service.Common
else else
{ {
//如果没有产生裁判，默认选择R1 //如果没有产生裁判，默认选择R1
if (item.ArmEnum== Arm.DoubleReadingArm1) if (item.ArmEnum == Arm.DoubleReadingArm1)
{ {
item.IsJudgeSelect = true; item.IsJudgeSelect = true;
} }
} }
} }
} }
if (arbitrationRule == ArbitrationRule.Reading) if (arbitrationRule == ArbitrationRule.Reading)
{ {
@ -2117,19 +2117,17 @@ 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 findItem = item.QuestionAnswerList.Where(t => t.QuestionType == questionType).FirstOrDefault();
if (findItem != null)
{ {
var questionType = item.IsBaseline == true ? QuestionType.ExistDisease : QuestionType.Tumor; findItem.QuestionName = _userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估";
var findItem = item.QuestionAnswerList.Where(t => t.QuestionType == questionType).FirstOrDefault();
if (findItem != null)
{
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();
@ -2146,16 +2144,14 @@ 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 findItem = item.QuestionAnswerList.Where(t => t.QuestionType == questionType).FirstOrDefault();
if (findItem != null)
{ {
var questionType = item.IsBaseline == true ? QuestionType.ExistDisease : QuestionType.ImgOncology; findItem.QuestionName = _userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估";
var findItem = item.QuestionAnswerList.Where(t => t.QuestionType == questionType).FirstOrDefault();
if (findItem != null)
{
findItem.QuestionName = _userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估";
}
} }
if (item.IsBaseline == true) if (item.IsBaseline == true)
@ -2164,7 +2160,7 @@ namespace IRaCIS.Core.Application.Service.Common
} }
else else
{ {
item.QuestionAnswerList = item.QuestionAnswerList.Where(t => t.QuestionType != QuestionType.ExistDisease).ToList(); item.QuestionAnswerList = item.QuestionAnswerList.Where(t => t.QuestionType != QuestionType.ExistDisease).ToList();
} }
} }
} }
@ -2243,7 +2239,7 @@ namespace IRaCIS.Core.Application.Service.Common
//2、完成阅片的病例数Q：R1,R2均完成阅片的访视数； //2、完成阅片的病例数Q：R1,R2均完成阅片的访视数；
exportInfo.VisitCount = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState == ReadingTaskState.HaveSigned) exportInfo.VisitCount = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState == ReadingTaskState.HaveSigned)
.GroupBy(t => new { t.SubjectId, t.SourceSubjectVisitId }) .GroupBy(t => new { t.SubjectId, t.SourceSubjectVisitId })
.Where(g => g.Count() == 2).Select(g => g.Key.SourceSubjectVisitId).Distinct().Count(); .Where(g => g.Count() == 2).Select(g => g.Key.SourceSubjectVisitId).Distinct().Count();
exportInfo.JudgeVisitCount = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingCategory == ReadingCategory.Judge && t.ReadingTaskState == ReadingTaskState.HaveSigned).Count(); exportInfo.JudgeVisitCount = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingCategory == ReadingCategory.Judge && t.ReadingTaskState == ReadingTaskState.HaveSigned).Count();