Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

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
+                    var findJudge = judegeList.FirstOrDefault(t => t.SubjectCode == item.SubjectCode
-                    && (t.VisitTaskNum - ReadingCommon.TaskNumDic[ReadingCategory.Judge]) == item.VisitTaskNum)?.JudgeArmEnum == item.ArmEnum ? true : false;
+                    && (t.VisitTaskNum - ReadingCommon.TaskNumDic[ReadingCategory.Judge]) == item.VisitTaskNum);
-                }
 
-                //如果没有产生裁判，默认选择R1
+                    if (findJudge != null)
-
-                //找到没有裁判的访视任务
-                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)
                     {
-                        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" : "病灶类型" });
                     }
-                    
+
                 }
 
                 //通过问题标识取并集

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; }