From 0bc0421ee3f6e704fe96cb0617a38907f3b45fc3 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Tue, 24 Sep 2024 15:09:09 +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

---
 .../ReadingCalculate/IVUSCalculateService.cs  | 34 +++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs
index 5f9afe152..7442ea160 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs
@@ -603,7 +603,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             Guid visitTaskId = Guid.Parse(request.Form["VisitTaskId"]);
             var dataTable =await _generalCalculateService.GetDataTableFromUpload(file);
 
-            var taskinfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).Include(x => x.Subject).FirstNotNullAsync();
+            var taskinfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).Include(x => x.Subject).Include(x=>x.TrialReadingCriterion).FirstNotNullAsync();
 
             var values = new
             {
@@ -663,10 +663,34 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     RowMark = questionInfo.OrderMark + decimal.Parse(maxnum.ToString()).GetLesionMark()
                 });
 
+                // 编号
+                tableAnswers.Add(new ReadingTableQuestionAnswer()
+                {
+                    Answer = item.PlaqueNum.ToString(),
+                    QuestionId = questionInfo.Id,
+                    TrialId = taskinfo.TrialId,
+                    VisitTaskId = taskinfo.Id,
+                    RowId = newRowId,
+                    RowIndex = maxnum,
+                    TableQuestionId = tableQuestionList.Where(x => x.ReadingQuestionId == questionInfo.Id && x.QuestionMark == QuestionMark.PlaqueNumber).Select(x => x.Id).FirstOrDefault(),
+                });
+
+                var emm = item.Emm.ToString();
+                var lumen=item.Lumen.ToString();
+                var emmSubtractionLumen = item.EmmSubtractionLumen.ToString();
+
+                if (taskinfo.TrialReadingCriterion.DigitPlaces != -1)
+                {
+                    var digitPlaces= taskinfo.TrialReadingCriterion.DigitPlaces??0;
+                    emm = decimal.Round(decimal.Parse(emm ?? "0"), digitPlaces).ToString("F" + digitPlaces.ToString());
+                    lumen = decimal.Round(decimal.Parse(lumen ?? "0"), digitPlaces).ToString("F" + digitPlaces.ToString());
+                    emmSubtractionLumen = decimal.Round(decimal.Parse(emmSubtractionLumen ?? "0"), digitPlaces).ToString("F" + digitPlaces.ToString());
+                }
+
                 // EMM 
                 tableAnswers.Add(new ReadingTableQuestionAnswer()
                 {
-                    Answer = item.Emm.ToString(),
+                    Answer = emm,
                     QuestionId = questionInfo.Id,
                     TrialId = taskinfo.TrialId,
                     VisitTaskId = taskinfo.Id,
@@ -677,7 +701,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                 tableAnswers.Add(new ReadingTableQuestionAnswer()
                 {
-                    Answer = item.Lumen.ToString(),
+                    Answer = lumen,
                     QuestionId = questionInfo.Id,
                     TrialId = taskinfo.TrialId,
                     VisitTaskId = taskinfo.Id,
@@ -688,7 +712,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                 tableAnswers.Add(new ReadingTableQuestionAnswer()
                 {
-                    Answer = item.EmmSubtractionLumen.ToString(),
+                    Answer = emmSubtractionLumen,
                     QuestionId = questionInfo.Id,
                     TrialId = taskinfo.TrialId,
                     VisitTaskId = taskinfo.Id,
@@ -799,8 +823,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     emm = decimal.Round(decimal.Parse(emm ?? "0"), inDto.DigitPlaces).ToString("F" + inDto.DigitPlaces.ToString());
                     EEMLumen = decimal.Round(decimal.Parse(EEMLumen ?? "0"), inDto.DigitPlaces).ToString("F" + inDto.DigitPlaces.ToString());
                     pav = decimal.Round(decimal.Parse(pav ?? "0"), inDto.DigitPlaces).ToString("F" + inDto.DigitPlaces.ToString());
-
-
                 }
                 #endregion