From 8ec9a29f93e772389c53a802bed7d0c8bde4bb38 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 4 Apr 2023 15:19:26 +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

---
 .../Reading/Dto/ReadingImageTaskViewModel.cs  |  2 +-
 .../ReadingImageTaskService.cs                |  2 +
 .../Dto/CriterionCalculateDto.cs              | 88 ++++++++++++++++++-
 3 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 3773a0b8c..7d2f67686 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -402,7 +402,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     {
         public Guid VisitTaskId { get; set; }
 
-        public Guid QuestionId { get; set; }
+        public Guid QuestionId { get; set; } = default(Guid);
 
         public Guid RowId { get; set; }
 
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 98aa91843..9de00eeca 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -1395,6 +1395,8 @@ namespace IRaCIS.Application.Services
                 return ResponseOutput.Ok(true);
             }
 
+            inDto.QuestionId = deleteRowInfo.QuestionId;
+
             if (await _readingTableAnswerRowInfoRepository.AnyAsync(x => x.SplitRowId == deleteRowInfo.Id && x.MergeRowId == deleteRowInfo.Id))
             {
                 throw new BusinessValidationFailedException(_localizer["ReadingImage_DeleteError"]);
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs
index 96d3eb29c..952d6eee3 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs
@@ -50,6 +50,92 @@ namespace IRaCIS.Core.Application.ViewModel
 
     public class IRECISTTargetLesionDto
     {
-        
+        /// <summary>
+        /// 基线未选择任何靶病灶
+        /// </summary>
+        public bool ExistsTargetLesion { get; set; }
+
+        /// <summary>
+        /// 上一访视评估为iCPD
+        /// </summary>
+        public bool LastTaskIsICPD { get; set; }
+
+        /// <summary>
+        /// 满足RECISTPD
+        /// </summary>
+        public bool MeetRECISTPD { get; set; }
+
+
+
+    }
+
+    /// <summary>
+    /// 新靶病灶评估Dto
+    /// </summary>
+    public class IRECISTNewTargetLesionDto
+    {
+        /// <summary>
+        /// 存在新靶病灶
+        /// </summary>
+        public bool ExistsNewTargetLesion { get; set; }
+
+        /// <summary>
+        /// 所有状态为消失
+        /// </summary>
+        public bool AllVanish { get; set; }
+
+        /// <summary>
+        /// 上一访视新靶病灶评估为“iUPD”
+        /// </summary>
+        public bool LastTaskIsiUPD { get; set; }
+
+        /// <summary>
+        /// SOD增加5mm以上
+        /// </summary>
+        public bool ISODAdd5mm { get; set; }
+
+        /// <summary>
+        /// 有"存在"状态的新靶病灶
+        /// </summary>
+        public bool HaveExixtsState { get; set; }
+
+        /// <summary>
+        /// 至少有一个新靶病无法评估
+        /// </summary>
+        public bool ExixtsUnevaluableState { get; set; }
+    }
+
+    public class IRECISTNewNoTargetLesionDto
+    {
+        /// <summary>
+        /// 存在新非靶病灶
+        /// </summary>
+        public bool ExistsNewNoTargetLesion { get; set; }
+
+        /// <summary>
+        /// 所有状态为消失
+        /// </summary>
+        public bool AllVanish { get; set; }
+
+
+        /// <summary>
+        /// 上一访视新靶病灶评估为“iUPD”
+        /// </summary>
+        public bool LastTaskIsiUPD { get; set; }
+
+        /// <summary>
+        /// 任一新非靶病灶状态为“增大”
+        /// </summary>
+        public bool ExixtsEnlargementState { get; set; }
+
+        /// <summary>
+        /// 有"存在"状态的病灶
+        /// </summary>
+        public bool HaveExixtsState { get; set; }
+
+        /// <summary>
+        /// 至少有一个病灶无法评估
+        /// </summary>
+        public bool ExixtsUnevaluableState { get; set; }
     }
 }