From c68e1494ac38ceb9ebc7c5d41eb7e3c1aef75e6a Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 7 Sep 2023 17:36:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LuganoCalculateService.cs                 | 53 +++++++++++++++++--
 1 file changed, 49 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
index eb96e4bd7..9ea1eec57 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
@@ -476,6 +476,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 // 脾肿垂直径最低点访视
                new ReadingCalculateData (){QuestionType=QuestionType.LowestSplenoncusVisit,GetStringFun=GetLowestSplenoncusVisit},
 
+
+                 new ReadingCalculateData (){QuestionType=QuestionType.SplenicEvaluation,GetStringFun=GetLowestSplenoncusVisit},
+
 				////靶病灶径线之和（SOD）
 				//new ReadingCalculateData (){QuestionType=QuestionType.SOD,GetDecimalNullFun=GetSODData},
 
@@ -1542,9 +1545,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             {
                 return 0;
             }
-            var baseLineTaskId = await GetBaseLineTaskId(inDto);
+           
 
-            var baseLineSpleenLength = (await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == baseLineTaskId && x.ReadingQuestionTrial.QuestionType == QuestionType.SpleenLength).Select(x => x.Answer).FirstOrDefaultAsync()).IsNullOrEmptyReturn0();
+            var baseLineSpleenLength =  await GetBaseLineSpleenLength(inDto);
 
             var presentSpleenLength = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.SpleenLength).Select(x => x.Answer).FirstOrDefault().IsNullOrEmptyReturn0();
             if (baseLineSpleenLength - 130 != 0)
@@ -1597,14 +1600,56 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 return string.Empty;
             }
 
-          
+
             var lowSplenoncus = taskAnswer.OrderBy(x => x.SpleenLength).FirstOrDefault();
-            return lowSplenoncus.VisitTaskNum;
+            return lowSplenoncus.BlindName;
 
 
         }
         #endregion
 
+        #region 获取脾脏评估
+
+        ///// <summary>
+        ///// 获取脾脏评估
+        ///// </summary>
+        ///// <param name="inDto"></param>
+        ///// <returns></returns>
+        //public async Task<string> GetSplenicEvaluation(ReadingCalculateDto inDto)
+        //{
+        //    if (inDto.IsBaseLine)
+        //    {
+        //        return SpleenAssessment.Stabilization.GetEnumInt();
+        //    }
+       
+
+
+
+        //    var baseLineSpleenLength =await GetBaseLineSpleenLength(inDto);
+
+        //           //  1、基线 垂直径> 130 mm
+        //           //2、与基线相比脾垂直径变化值≥10 mm
+        //           //与基线相比脾肿大增加的百分比 > 50％
+        //}
+        #endregion
+
+        #region 获取基线脾脏长度
+        /// <summary>
+        /// 获取基线脾脏长度
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        public async Task<decimal> GetBaseLineSpleenLength(ReadingCalculateDto inDto)
+        {
+            var baseLineTaskId = await GetBaseLineTaskId(inDto);
+
+            var baseLineSpleenLength = (await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == baseLineTaskId && x.ReadingQuestionTrial.QuestionType == QuestionType.SpleenLength).Select(x => x.Answer).FirstOrDefaultAsync()).IsNullOrEmptyReturn0();
+            return baseLineSpleenLength;
+        }
+
+
+        #endregion
+
         #region 与最低点相比脾脏垂直径长度的增加值
         /// <summary>
         /// 与最低点相比脾脏垂直径长度的增加值