From 2d651ca51dd4eb504162b7a087f99554379e2153 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 5 Jun 2023 14:57:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IRaCIS.Core.Application.xml                   | 15 +++++++++++++++
 .../IRECIST1Point1CalculateService.cs             |  8 ++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 67429a1a6..62d5a29ed 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -1220,6 +1220,11 @@
             首次转变的任务ID
             </summary>
         </member>
+        <member name="F:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.compareTaskList">
+            <summary>
+            触发任务list
+            </summary>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetDeleteLesionStatrIndex(IRaCIS.Core.Application.Service.Reading.Dto.DeleteReadingRowAnswerInDto)">
             <summary>
             删除病灶获取起始病灶序号（RECIST1Point1 固定是1）
@@ -7444,6 +7449,16 @@
         <member name="T:IRaCIS.Core.Application.ViewModel.SystemNoticeAddOrEdit">
             <summary> SystemNoticeAddOrEdit  列表查询参数模型</summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.TirggerTaskInfo.TargetAssessmentIsIUorIC">
+            <summary>
+            靶病灶是否为IUPD或者ICPD
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.TirggerTaskInfo.NewTargetLesionAssessmentIsIUorIC">
+            <summary>
+            靶病灶是否为IUPD或者ICPD
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.ViewModel.VisitStudyTime.SubjectVisitId">
             <summary>
             访视Id
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
index 8ec5e87db..0321b51b3 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
@@ -399,7 +399,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         /// <param name="visitTaskId"></param>
         /// <param name="type"></param>
         /// <returns></returns>
-        [HttpPost]
+        [HttpGet]
         public async Task TestCalculate(Guid visitTaskId, QuestionType? type)
         {
             //_logger.LogError("测试计算");
@@ -1761,7 +1761,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 compareTaskList.ForEach(x =>
                 {
                     x.TargetAssessmentIsIUorIC = answers.Any(x => questionType == QuestionType.TargetLesion && (x.Answer == TargetAssessment.iUPD.GetEnumInt() || x.Answer == TargetAssessment.iCPD.GetEnumInt()));
-                    x.NewTargetLesionAssessmentIsIUorIC = answers.Any(x => questionType == QuestionType.TargetLesion && (x.Answer == NewTargetLesionAssessment.iUPD.GetEnumInt() || x.Answer == NewTargetLesionAssessment.iCPD.GetEnumInt()));
+                    x.NewTargetLesionAssessmentIsIUorIC = answers.Any(x => questionType == QuestionType.NewTargetLesion && (x.Answer == NewTargetLesionAssessment.iUPD.GetEnumInt() || x.Answer == NewTargetLesionAssessment.iCPD.GetEnumInt()));
                 });
             }
            
@@ -1772,6 +1772,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
 
             Guid? compareTaskId = null;
+            if(compareTaskList.Count()==0)
+            {
+                return compareTaskId;
+            }
             int index = 0;
             switch (questionType)
             {