From 6c670881fa9ca922ae880945c1d95cb656923b88 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 2 Nov 2022 17:20:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IRaCIS.Core.Application.xml                | 18 +++++++++++-------
 .../ReadingCalculate/PCWG3CalculateService.cs  |  4 ++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index a0a1ba509..93dbad1b7 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -1158,13 +1158,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.RECIST1Point1CalculateService.GetTargetLesionEvaluate(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
-            <summary>
-            获取靶病灶评估
-            </summary>
-            <param name="inDto"></param>
-            <returns></returns>
-        </member>
+        <!-- Badly formed XML comment ignored for member "M:IRaCIS.Core.Application.Service.ReadingCalculate.RECIST1Point1CalculateService.GetTargetLesionEvaluate(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)" -->
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.RECIST1Point1CalculateService.GetNoTargetLesionEvaluate(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
             <summary>
             获取非靶病灶评估
@@ -1628,6 +1622,16 @@
             排序字段
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TargetLesionCalculateDto.LowSod">
+            <summary>
+            最低SOD
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TargetLesionCalculateDto.ExistsTargetLesion">
+            <summary>
+            是否存在靶病灶
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TargetLesionCalculateDto.SumOfDiameter">
             <summary>
             非淋巴结靶病灶长径之和  decimal
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
index e4ae97c2c..087d4489d 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
@@ -167,7 +167,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     var rowlist = tableAnsweRowInfos.Where(x => x.QuestionId == question.QuestionId).OrderBy(x => x.RowIndex).ToList();
 
 
-                    question.Childrens = rowlist.OrderBy(x=>x.FristAddTaskNum).ThenBy(x=>x.RowIndex).Select(x => new ReadingReportDto()
+                    question.Childrens = rowlist.OrderBy(x=>x.RowIndex).Select(x => new ReadingReportDto()
                     {
                         QuestionName = question.OrderMark + x.RowIndex.GetLesionMark(),
                         SplitOrMergeLesionName = x.MergeName.IsNullOrEmpty() ? x.SplitName : x.MergeName,
@@ -213,7 +213,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                                 tableQuestion.Answer.Add(new TaskQuestionAnswer()
                                 {
-                                    Answer = tableAnswers.Where(x => x.VisitTaskId == task.VisitTaskId && x.QuestionId == tableQuestion.QuestionId && x.RowId == tableQuestion.RowId && x.TableQuestionId == tableQuestion.TableQuestionId).Select(x => x.Answer).FirstIsNullReturnEmpty(),
+                                    Answer = tableAnswers.Where(x => x.VisitTaskId == task.VisitTaskId && x.QuestionId == tableQuestion.QuestionId && x.RowIndex == tableQuestion.RowIndex && x.TableQuestionId == tableQuestion.TableQuestionId).Select(x => x.Answer).FirstIsNullReturnEmpty(),
                                     TaskName = task.TaskName,
                                     VisitTaskId = task.VisitTaskId,
                                 });