From 39435b0068550f336bf604839d408a36f10582e6 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 24 Oct 2024 15:10:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BF=E8=A7=86=E8=A3=81?= =?UTF-8?q?=E5=88=A4=E5=AF=BC=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Common/ExcelExportService.cs | 40 +++++++++++-------- .../Service/QC/DTO/QCListViewModel.cs | 2 +- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index badad766f..50764b6d7 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -1626,23 +1626,31 @@ namespace IRaCIS.Core.Application.Service.Common foreach (var item in resultExceptJudgeList) { - item.IsJudgeSelect = judegeList.FirstOrDefault(t => t.SubjectCode == item.SubjectCode - && (t.VisitTaskNum - ReadingCommon.TaskNumDic[ReadingCategory.Judge]) == item.VisitTaskNum)?.JudgeArmEnum == item.ArmEnum ? true : false; - } + var findJudge = judegeList.FirstOrDefault(t => t.SubjectCode == item.SubjectCode + && (t.VisitTaskNum - ReadingCommon.TaskNumDic[ReadingCategory.Judge]) == item.VisitTaskNum); - //如果没有产生裁判，默认选择R1 - - //找到没有裁判的访视任务 - var notJudgeList = resultExceptJudgeList.GroupBy(t => new { t.SubjectCode, t.VisitTaskNum }).Where(g => g.All(t => t.IsJudgeSelect == false)).Select(g => new { g.Key.SubjectCode, g.Key.VisitTaskNum }).ToList(); - - foreach (var item in resultExceptJudgeList) - { - if (notJudgeList.Any(t => t.SubjectCode == item.SubjectCode && t.VisitTaskNum == item.VisitTaskNum) && item.ArmEnum == Arm.DoubleReadingArm1) + if (findJudge != null) { - item.IsJudgeSelect = true; + if (findJudge.ReadingTaskState == ReadingTaskState.HaveSigned) + { + item.IsJudgeSelect = findJudge.JudgeArmEnum == item.ArmEnum ? true : false; + } + else + { + //默认也是null 其实不用赋值 + item.IsJudgeSelect = null; + } } + else + { + //如果没有产生裁判，默认选择R1 + if (item.ArmEnum== Arm.DoubleReadingArm1) + { + item.IsJudgeSelect = true; + } + } } - + } if (arbitrationRule == ArbitrationRule.Reading) { @@ -1865,7 +1873,7 @@ namespace IRaCIS.Core.Application.Service.Common list.Add(new ExportDocumentDes() { Code = StaticData.Export.CommonJudgeReadingDetail_Export, ExportCatogory = ExportResult.DetailedTableOfAdjudicationResults }); if (criterion.CriterionType == CriterionType.RECIST1Point1 || criterion.CriterionType == CriterionType.RECIST1Pointt1_MB - || criterion.CriterionType == CriterionType.IRECIST1Point1 || criterion.CriterionType == CriterionType.Lugano2014 + || criterion.CriterionType == CriterionType.IRECIST1Point1 || criterion.CriterionType == CriterionType.Lugano2014 || criterion.CriterionType == CriterionType.Lugano2014WithoutPET || criterion.CriterionType == CriterionType.PCWG3) { list.Add(new ExportDocumentDes() { Code = StaticData.Export.ReadingLession_Export, ExportCatogory = ExportResult.DetailedTableOfLesions }); @@ -2029,11 +2037,11 @@ namespace IRaCIS.Core.Application.Service.Common dynamicExtraAddTitleList.Add(new DymamicQuestionInfo() { QuestionName = _userInfo.IsEn_Us ? "Lesion ID" : "病灶编号" }); dynamicExtraAddTitleList.Add(new DymamicQuestionInfo() { QuestionName = _userInfo.IsEn_Us ? "Lesion Type" : "病灶类型" }); } - else if(criterion.CriterionType== CriterionType.PCWG3) + else if (criterion.CriterionType == CriterionType.PCWG3) { dynamicExtraAddTitleList.Add(new DymamicQuestionInfo() { QuestionName = _userInfo.IsEn_Us ? "Lesion Type" : "病灶类型" }); } - + } //通过问题标识取并集 diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs index 1c9a78fe5..e85fb5f71 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs @@ -1107,7 +1107,7 @@ namespace IRaCIS.Core.Application.Contracts //裁判选择标记 //根据裁判的任务结果 设置访视任务的这个字段 该字段表示 裁判认同该任务的结果 - [DictionaryTranslateAttribute("YesOrNo")] + [DictionaryTranslateAttribute("YesOrNoAudit")] public bool? IsJudgeSelect { get; set; }