res 同步病灶调整

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -5395,7 +5395,7 @@
         </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.PCWG3CalculateService.ChangeLastTaskSiteVisitForTumorEvaluation(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
             <summary>
-            修改上一次访视结果
+            修改上一次访视结果 并且计算是不是PD
             </summary>
             <param name="inDto"></param>
             <returns></returns>

IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs

@@ -867,6 +867,15 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                         TrialId = x.TrialId,
                     }).ToListAsync();
 
+
+                        // 肛门淋巴结
+                        var portalOrgan = await _organInfoRepository.Where(x => x.SystemCriterionId == trialReadingCriterion.ReadingQuestionCriterionSystemId &&
+                     
+                          x.Part == "肝门淋巴结" &&
+                      
+                          x.IsLymphNodes == IsLymph.Yes
+                        ).FirstOrDefaultAsync();
+
                         foreach (var item in recistTableAnswers)
                         {
                             var rowinfo = tableRowAnswers.Where(y => y.OriginalId == item.RowId).FirstOrDefault();
@@ -874,14 +883,19 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                             {
                                 item.QuestionId = rowinfo.QuestionId;
 
-                                var IslymphNode= recistTableAnswers.Where(x=>x.RowId== item.RowId&&x.QuestionMark==QuestionMark.IsLymph).Select(x=>x.Answer).FirstIsNullReturnEmpty().EqEnum(YesOrNoOrNa.Yes);
-                                var minorAxis= recistTableAnswers.Where(x => x.RowId == item.RowId && x.QuestionMark == QuestionMark.ShortAxis).Select(x => x.Answer).FirstIsNullReturnEmpty().IsNullOrEmptyReturn0();
-                                
-                                var iSbetween15and20= minorAxis >= 15 && minorAxis < 20;
-                                if (item.QuestionMark == QuestionMark.State && IslymphNode && iSbetween15and20 && rowinfo.LesionType == LesionType.TargetLesion)
+
+                                if (portalOrgan != null && rowinfo.OrganInfoId == portalOrgan.Id)
                                 {
-                                    item.Answer = string.Empty;
+                                    var IslymphNode = recistTableAnswers.Where(x => x.RowId == item.RowId && x.QuestionMark == QuestionMark.IsLymph).Select(x => x.Answer).FirstIsNullReturnEmpty().EqEnum(YesOrNoOrNa.Yes);
+                                    var minorAxis = recistTableAnswers.Where(x => x.RowId == item.RowId && x.QuestionMark == QuestionMark.ShortAxis).Select(x => x.Answer).FirstIsNullReturnEmpty().IsNullOrEmptyReturn0();
+
+                                    var iSbetween15and20 = minorAxis >= 15 && minorAxis < 20;
+                                    if (item.QuestionMark == QuestionMark.State && IslymphNode && iSbetween15and20 && rowinfo.LesionType == LesionType.TargetLesion)
+                                    {
+                                        item.Answer = string.Empty;
+                                    }
                                 }
+                               
                             }