From 1b26ed1b651a0f6a80301ebf3d9f811a3478f133 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Thu, 26 Sep 2024 13:27:47 +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

---
 .../Service/ImageAndDoc/DownloadAndUploadService.cs       | 8 +++++---
 .../Reading/ReadingCriterion/ReadingCriterionService.cs   | 1 +
 .../Service/ReadingCalculate/OCTCalculateService.cs       | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
index 7ec7a0ce6..596faf077 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
@@ -618,22 +618,24 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             {
                 if (dicomStudyId == null)
                 {
-                    await _taskStudyRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId);
+                    await _taskStudyRepository.DeleteFromQueryAsync(t => t.VisitTaskId == visitTaskId);
                     await _taskSeriesRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId);
                     await _taskInstanceRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId);
                 }
                 else
                 {
-                    await _taskStudyRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId);
+                    await _taskStudyRepository.DeleteFromQueryAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId);
                     await _taskSeriesRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId);
                     await _taskInstanceRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId);
                 }
             }
             else
             {
-                await _noneDicomStudyFileReposiotry.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.OriginNoneDicomStudyId == noneDicomStudyId);
+                await _noneDicomStudyFileReposiotry.DeleteFromQueryAsync(t => t.VisitTaskId == visitTaskId && t.OriginNoneDicomStudyId == noneDicomStudyId);
             }
 
+            await _noneDicomStudyFileReposiotry.SaveChangesAsync();
+
             return ResponseOutput.Ok();
         }
 
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs
index 6fa5ab142..7c95a89e3 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs
@@ -671,6 +671,7 @@ namespace IRaCIS.Core.Application.Service.RC
                 switch (criterion.CriterionType)
                 {
                     case CriterionType.IVUS:
+                        criterion.IsReadingPeriod = false;
                         criterion.IsImageFilter = false;
                         criterion.IsReadingTaskViewInOrder = ReadingOrder.SubjectRandom;
                         criterion.ImageDownloadEnum = ReadingImageDownload.Subejct;
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
index 5079a850a..c1b195d4a 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
@@ -985,7 +985,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 // 匹配动脉段最小FCT
                 tableAnswers.Add(new ReadingTableQuestionAnswer()
                 {
-                    Answer = oCTFCTInfos.Count()==0? "0.00" : GetDigitPlacesData(oCTFCTInfos.Where(x => x.PlaqueNum == item).MinOrDefault(x => x.Data).ToString()),
+                    Answer = oCTFCTInfos.Where(x => x.PlaqueNum == item).Count()==0? "0.00" : GetDigitPlacesData(oCTFCTInfos.Where(x => x.PlaqueNum == item).MinOrDefault(x => x.Data).ToString()),
                     Id = NewId.NextGuid(),
                     QuestionId = patchDataStatisticsInfo.Id,
                     TrialId = inDto.TrialId,
@@ -1011,7 +1011,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 // 脂质角度平均值
                 tableAnswers.Add(new ReadingTableQuestionAnswer()
                 {
-                    Answer = lipidAngleInfos.Count() == 0 ? "0.00" : GetDigitPlacesData(lipidAngleInfos.Where(x => x.PlaqueNum == item).Average(x => x.Data).ToString()),
+                    Answer = lipidAngleInfos.Where(x => x.PlaqueNum == item).Count() == 0 ? "0.00" : GetDigitPlacesData(lipidAngleInfos.Where(x => x.PlaqueNum == item).Average(x => x.Data).ToString()),
                     Id = NewId.NextGuid(),
                     QuestionId = patchDataStatisticsInfo.Id,
                     TrialId = inDto.TrialId,
@@ -1024,7 +1024,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 // 脂质角度最大值
                 tableAnswers.Add(new ReadingTableQuestionAnswer()
                 {
-                    Answer = lipidAngleInfos.Count() == 0 ? "0.00" : GetDigitPlacesData(lipidAngleInfos.Where(x => x.PlaqueNum == item).MaxOrDefault(x => x.Data).ToString()),
+                    Answer = lipidAngleInfos.Where(x => x.PlaqueNum == item).Count() == 0 ? "0.00" : GetDigitPlacesData(lipidAngleInfos.Where(x => x.PlaqueNum == item).MaxOrDefault(x => x.Data).ToString()),
                     Id = NewId.NextGuid(),
                     QuestionId = patchDataStatisticsInfo.Id,
                     TrialId = inDto.TrialId,