IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs

@@ -13,7 +13,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
     [ApiExplorerSettings(GroupName = "Image")]
     public class ReadingCalculateService(IEnumerable<ICriterionCalculateService> _criterionServices,
        IRepository<VisitTask> _visitTaskRepository,
-          IHttpContextAccessor httpContext,
        IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
        IStringLocalizer _localizer, IUserInfo _userInfo
 
@@ -39,24 +38,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
 
 
-        /// <summary>
+        
-        /// 阅片导入
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public async Task ReadingImport()
-        {
-            var request = httpContext.HttpContext!.Request;
-            var file = request.Form.Files[0];
-            Guid visitTaskId = Guid.Parse(request.Form["VisitTaskId"]);
-
-            var service = await this.GetService(visitTaskId);
-            if (service != null)
-            {
-                await service.ReadingImport();
-            }
-        }
-
 
         /// <summary>
         /// 获取Service

IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs

@@ -27,14 +27,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         ILogger<IRECIST1Point1CalculateService> _logger, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICriterionCalculateService
     {
 
-        /// <summary>
-        /// 阅片导入
-        /// </summary>
-        /// <returns></returns>
-        public async Task ReadingImport()
-        {
-        }
-
         /// <summary>
         /// 获取阅片的计算数据
         /// </summary>

IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs

@@ -33,23 +33,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         ILogger<IRECIST1Point1CalculateService> _logger, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICriterionCalculateService
     {
 
-        /// <summary>
-        /// 阅片导入
-        /// </summary>
-        /// <returns></returns>
-        public async Task ReadingImport()
-        {
-            var request = httpContext.HttpContext!.Request;
-            ReadingImportType readingImportType = (ReadingImportType)  int.Parse(request.Form["ReadingImportType"].ToString());
-
-            switch (readingImportType)
-            {
-                case ReadingImportType.IVUS_MatchingSegment:
-                    await UploadIVUSTemplate();
-                    break;
-            }
-        }
-
         /// <summary>
         /// 获取阅片的计算数据
         /// </summary>
@@ -783,8 +766,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             }
 
 
-            await _readingTableAnswerRowInfoRepository.DeleteFromQueryAsync(x => x.QuestionId == questionInfo.Id && x.VisitTaskId == taskinfo.Id);
+            await _readingTableAnswerRowInfoRepository.BatchDeleteNoTrackingAsync(x => x.QuestionId == questionInfo.Id && x.VisitTaskId == taskinfo.Id);
-            await _readingTableQuestionAnswerRepository.DeleteFromQueryAsync(x => x.QuestionId == questionInfo.Id && x.VisitTaskId == taskinfo.Id);
+            await _readingTableQuestionAnswerRepository.BatchDeleteNoTrackingAsync(x => x.QuestionId == questionInfo.Id && x.VisitTaskId == taskinfo.Id);
             await _readingTableAnswerRowInfoRepository.AddRangeAsync(tableAnsweRowInfos);
             await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers);
             await _readingTableQuestionAnswerRepository.SaveChangesAsync();

IRaCIS.Core.Application/Service/ReadingCalculate/Interface/ICriterionCalculateService.cs

@@ -13,13 +13,6 @@ namespace IRaCIS.Core.Application.Service
         /// <returns></returns>
         Task CalculateTask(CalculateTaskInDto inDto);
 
-
-        /// <summary>
-        /// 阅片导入
-        /// </summary>
-        /// <returns></returns>
-        Task ReadingImport();
-
         /// <summary>
         /// 验证访视提交
         /// </summary>

IRaCIS.Core.Application/Service/ReadingCalculate/Interface/IReadingCalculateService.cs

@@ -14,9 +14,6 @@ namespace IRaCIS.Core.Application.Service
         /// <returns></returns>
         Task CalculateTask(CalculateTaskInDto inDto);
 
-
-     
-
         /// <summary>
         /// 验证访视提交
         /// </summary>

IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs

@@ -28,13 +28,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         IGeneralCalculateService _generalCalculateService,
         IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICriterionCalculateService, ILuganoCalculateService
     {
-        /// <summary>
+
-        /// 阅片导入
-        /// </summary>
-        /// <returns></returns>
-        public async Task ReadingImport()
-        {
-        }
 
         /// <summary>
         /// 获取阅片的计算数据

IRaCIS.Core.Application/Service/ReadingCalculate/LuganoWithoutPETCalculateService.cs

@@ -29,14 +29,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICriterionCalculateService, ILuganoCalculateService
     {
 
-        /// <summary>
-        /// 阅片导入
-        /// </summary>
-        /// <returns></returns>
-        public async Task ReadingImport()
-        {
-        }
-
         /// <summary>
         /// 获取阅片的计算数据
         /// </summary>

IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs

@@ -26,14 +26,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICriterionCalculateService
     {
 
-        /// <summary>
-        /// 阅片导入
-        /// </summary>
-        /// <returns></returns>
-        public async Task ReadingImport()
-        {
-        }
-
         /// <summary>
         /// 获取阅片的计算数据
         /// </summary>

IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFCalculateService.cs

@@ -33,15 +33,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
         private List<SiteVisitForTumor> siteVisitForTumorList = new List<SiteVisitForTumor>();
 
-        /// <summary>
-        /// 阅片导入
-        /// </summary>
-        /// <returns></returns>
-        public async Task ReadingImport()
-        {
-        }
-
-
         /// <summary>
         /// 获取阅片的计算数据
         /// </summary>

IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs

@@ -28,26 +28,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository,
         ILogger<IRECIST1Point1CalculateService> _logger, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICriterionCalculateService
     {
-        /// <summary>
-        /// 阅片导入
-        /// </summary>
-        /// <returns></returns>
-        public async Task ReadingImport()
-        {
-            var request = httpContext.HttpContext!.Request;
-            ReadingImportType readingImportType = (ReadingImportType)int.Parse(request.Form["ReadingImportType"].ToString());
-
-            switch (readingImportType)
-            {
-                case ReadingImportType.OCT_FCT:
-                    await UploadOCTFCTTemplate();
-                    break;
-
-                case ReadingImportType.OCT_LipidAngle:
-                    await UploadOCTLipidAngleTemplate();
-                    break;
-            }
-        }
 
         /// <summary>
         /// 获取阅片的计算数据
@@ -647,8 +627,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 }
 
             }
-            await _readingTableAnswerRowInfoRepository.DeleteFromQueryAsync(x => x.QuestionId == questionInfo.Id && x.VisitTaskId == taskinfo.Id);
+            await _readingTableAnswerRowInfoRepository.BatchDeleteNoTrackingAsync(x => x.QuestionId == questionInfo.Id && x.VisitTaskId == taskinfo.Id);
-            await _readingTableQuestionAnswerRepository.DeleteFromQueryAsync(x => x.QuestionId == questionInfo.Id && x.VisitTaskId == taskinfo.Id);
+            await _readingTableQuestionAnswerRepository.BatchDeleteNoTrackingAsync(x => x.QuestionId == questionInfo.Id && x.VisitTaskId == taskinfo.Id);
             await _readingTableAnswerRowInfoRepository.AddRangeAsync(tableAnsweRowInfos);
             await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers);
             await _readingTableQuestionAnswerRepository.SaveChangesAsync();
@@ -822,8 +802,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     });
                 }
             }
-            await _readingTableAnswerRowInfoRepository.DeleteFromQueryAsync(x => x.QuestionId == questionInfo.Id && x.VisitTaskId == taskinfo.Id);
+            await _readingTableAnswerRowInfoRepository.BatchDeleteNoTrackingAsync(x => x.QuestionId == questionInfo.Id && x.VisitTaskId == taskinfo.Id);
-            await _readingTableQuestionAnswerRepository.DeleteFromQueryAsync(x => x.QuestionId == questionInfo.Id && x.VisitTaskId == taskinfo.Id);
+            await _readingTableQuestionAnswerRepository.BatchDeleteNoTrackingAsync(x => x.QuestionId == questionInfo.Id && x.VisitTaskId == taskinfo.Id);
             await _readingTableAnswerRowInfoRepository.AddRangeAsync(tableAnsweRowInfos);
             await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers);
             await _readingTableQuestionAnswerRepository.SaveChangesAsync();

IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs

@@ -27,14 +27,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
         private List<SiteVisitForTumor> siteVisitForTumorList;
 
-        /// <summary>
-        /// 阅片导入
-        /// </summary>
-        /// <returns></returns>
-        public async Task ReadingImport()
-        {
-        }
-
         /// <summary>
         /// 获取阅片的计算数据
         /// </summary>

IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs

@@ -24,14 +24,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICriterionCalculateService
     {
 
-        /// <summary>
-        /// 阅片导入
-        /// </summary>
-        /// <returns></returns>
-        public async Task ReadingImport()
-        {
-        }
-
         /// <summary>
         /// 获取阅片的计算数据
         /// </summary>

IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs

@@ -24,14 +24,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICriterionCalculateService
     {
 
-        /// <summary>
-        /// 阅片导入
-        /// </summary>
-        /// <returns></returns>
-        public async Task ReadingImport()
-        {
-        }
-
         /// <summary>
         /// 获取阅片的计算数据
         /// </summary>

IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs

@@ -27,14 +27,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
         private List<SiteVisitForTumor> siteVisitForTumorList = new List<SiteVisitForTumor>();
 
-        /// <summary>
-        /// 阅片导入
-        /// </summary>
-        /// <returns></returns>
-        public async Task ReadingImport()
-        {
-        }
-
         /// <summary>
         /// 获取阅片的计算数据
         /// </summary>

IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs

@@ -34,33 +34,10 @@ namespace IRaCIS.Core.Domain.Share
     }
 
 
-    /// <summary>
+	/// <summary>
-    /// 阅片标准导入类型
+	/// 裁判匹配类型
-    /// </summary>
+	/// </summary>
-    public enum ReadingImportType
+	public enum JudgeDifferenceType
-    {
-        /// <summary>
-        /// IVUS-各匹配段测量的值
-        /// </summary>
-        IVUS_MatchingSegment = 0,
-
-        /// <summary>
-        /// OCT-FCT
-        /// </summary>
-        OCT_FCT = 1,
-
-        /// <summary>
-        /// OCT-脂质角度
-        /// </summary>
-        OCT_LipidAngle = 2,
-
-    }
-
-
-    /// <summary>
-    /// 裁判匹配类型
-    /// </summary>
-    public enum JudgeDifferenceType
 	{
 		/// <summary>
 		/// >