From 199884220046d9510f0447fcdf9597ee74a772de Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Tue, 2 Jun 2026 10:38:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MRIPDFFAdvanceCalculateService.cs         | 57 +++++++++++--------
 IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs  |  5 ++
 2 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFAdvanceCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFAdvanceCalculateService.cs
index 735c53616..313d1bb00 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFAdvanceCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFAdvanceCalculateService.cs
@@ -517,11 +517,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
         public async Task VerifyVisitTaskQuestions(VerifyVisitTaskQuestionsInDto inDto)
         {
-            ReadingCalculateDto readingData = await _generalCalculateService.GetReadingCalculateDto(inDto.VisitTaskId);
+            //ReadingCalculateDto readingData = await _generalCalculateService.GetReadingCalculateDto(inDto.VisitTaskId);
 
-            var markList = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId).ToListAsync();
-            var rowInfo = readingData.QuestionInfo.Where(x => x.LesionType == LesionType.FatFraction)
-              .SelectMany(x => x.TableRowInfoList).ToList();
+            //var markList = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId).ToListAsync();
+            //var rowInfo = readingData.QuestionInfo.Where(x => x.LesionType == LesionType.FatFraction)
+            //  .SelectMany(x => x.TableRowInfoList).ToList();
 
             //var tableQuestionList = rowInfo.Where(x => x.TableQuestionList.Any(x => x.QuestionMark == QuestionMark.AverageValue && x.Answer.IsNotNullOrEmpty())).ToList();
 
@@ -530,32 +530,39 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             //    throw new BusinessValidationFailedException(_localizer["MRIPDFF_AllNeedToBeMark"]);
             //}
 
-            try
-            {
-                List<QuestionMark?> questionMarkList = new List<QuestionMark?>() { QuestionMark.FirstMeasurement, QuestionMark.SecondMeasurement, QuestionMark.ThirdMeasurement, QuestionMark.FourthMeasurement };
-                var measuredValueList = rowInfo.SelectMany(x => x.TableQuestionList).Where(x =>x.Answer.IsNotNullOrEmpty()&& questionMarkList.Contains(x.QuestionMark)).Select(x => decimal.Parse(x.Answer)).ToList();
-                if (measuredValueList.Any(x => x > 100))
-                {
-                    throw new BusinessValidationFailedException(_localizer["MRIPDFF_MeasurementGT100"]);
-                }
-            }
-            catch (Exception)
-            {
+            var instanceCount = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.InstanceId != null).Select(x => x.InstanceId).Distinct().CountAsync();
 
-                throw new BusinessValidationFailedException(_localizer["MRIPDFF_MeasurementGT100"]);
+            if (instanceCount > 1)
+            {
+                throw new BusinessValidationFailedException(_localizer["MRIPDFFAdvance_MarkMustBeSameInstance"]);
             }
 
-            var notableQuestionList = rowInfo.Where(x => x.TableQuestionList.Any(x => x.QuestionMark == QuestionMark.IsMeasurable && x.Answer.EqEnum(YesOrNoOrNa.No))).ToList();
+            //try
+            //{
+            //    List<QuestionMark?> questionMarkList = new List<QuestionMark?>() { QuestionMark.FirstMeasurement, QuestionMark.SecondMeasurement, QuestionMark.ThirdMeasurement, QuestionMark.FourthMeasurement };
+            //    var measuredValueList = rowInfo.SelectMany(x => x.TableQuestionList).Where(x =>x.Answer.IsNotNullOrEmpty()&& questionMarkList.Contains(x.QuestionMark)).Select(x => decimal.Parse(x.Answer)).ToList();
+            //    if (measuredValueList.Any(x => x > 100))
+            //    {
+            //        throw new BusinessValidationFailedException(_localizer["MRIPDFF_MeasurementGT100"]);
+            //    }
+            //}
+            //catch (Exception)
+            //{
+
+            //    throw new BusinessValidationFailedException(_localizer["MRIPDFF_MeasurementGT100"]);
+            //}
+
+            //var notableQuestionList = rowInfo.Where(x => x.TableQuestionList.Any(x => x.QuestionMark == QuestionMark.IsMeasurable && x.Answer.EqEnum(YesOrNoOrNa.No))).ToList();
 
 
-            foreach (var item in notableQuestionList)
-            {
-                if (markList.Any(x => x.RowId == item.RowId && x.MeasureData.IsNotNullOrEmpty()))
-                {
-                    throw new BusinessValidationFailedException(_localizer["MRIPDFF_NeedClearMark"]);
-                }
-            }
-        
+            //foreach (var item in notableQuestionList)
+            //{
+            //    if (markList.Any(x => x.RowId == item.RowId && x.MeasureData.IsNotNullOrEmpty()))
+            //    {
+            //        throw new BusinessValidationFailedException(_localizer["MRIPDFF_NeedClearMark"]);
+            //    }
+            //}
+
         }
     }
 }
diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
index d9ff423a0..8899f8bd1 100644
--- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
+++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
@@ -3237,6 +3237,11 @@ namespace IRaCIS.Core.Domain.Share
         /// 保存eCRF
         /// </summary>
         SaveEICRFQuestions = 12,
+
+        /// <summary>
+        /// 保存Advance肝脏分段
+        /// </summary>
+        SaveAdvanceLiverSegments = 13,
     }
 
     /// <summary>