移除CustomTag表

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -56,7 +56,7 @@ namespace IRaCIS.Core.Application.Service
           IRepository<OrganTrialInfo> _organTrialInfoRepository,
         IRepository<TrialDocument> _trialDocumentRepository,
         ILuganoCalculateService _luganoCalculateService,
-        IRepository<ReadingCustomTag> _readingCustomTagRepository,
+        //IRepository<ReadingCustomTag> _readingCustomTagRepository,
         IRepository<ReadingTaskQuestionMark> _readingTaskQuestionMarkRepository,
         IRepository<ReadingTrialCriterionDictionary> _readingTrialCriterionDictionaryRepository,
         IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository,
@@ -279,7 +279,7 @@ namespace IRaCIS.Core.Application.Service
         [HttpPost]
         public async Task<IResponseOutput> SubmitCustomTag(ReadingCustomTagDto inDto)
         {
-            var entity = await _readingCustomTagRepository.InsertOrUpdateAsync(inDto, true);
+            var entity = await _readingTaskQuestionMarkRepository.InsertOrUpdateAsync(inDto, true);
             return ResponseOutput.Ok(entity.Id.ToString());
         }
 
@@ -291,7 +291,7 @@ namespace IRaCIS.Core.Application.Service
         [HttpPost("{id:guid}")]
         public async Task<IResponseOutput> DeleteCustomTag(Guid id)
         {
-            var success = await _readingCustomTagRepository.DeleteFromQueryAsync(t => t.Id == id, true);
+            var success = await _readingTaskQuestionMarkRepository.DeleteFromQueryAsync(t => t.Id == id, true);
             return ResponseOutput.Ok();
         }
 
@@ -304,9 +304,7 @@ namespace IRaCIS.Core.Application.Service
         [HttpPost]
         public async Task<List<ReadingCustomTagDto>> GetCustomTag(GetCustomTagInDto inQuery)
         {
-            var result = await _readingCustomTagRepository.Where(x => x.VisitTaskId == inQuery.VisitTaskId).ProjectTo<ReadingCustomTagDto>(_mapper.ConfigurationProvider).ToListAsync();
-
-            result.AddRange(await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inQuery.VisitTaskId).ProjectTo<ReadingCustomTagDto>(_mapper.ConfigurationProvider).ToListAsync());
+            var result = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inQuery.VisitTaskId).ProjectTo<ReadingCustomTagDto>(_mapper.ConfigurationProvider).ToListAsync();
             return result;
         }
 
@@ -3353,7 +3351,7 @@ namespace IRaCIS.Core.Application.Service
             await _readingTaskQuestionAnswerRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId);
             await _readingTableQuestionAnswerRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId);
             await _readingTaskQuestionMarkRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId);
-            await _readingCustomTagRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId);
+           
             await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => x.Id == inDto.VisitTaskId, x => new VisitTask()
             {
                 ReadingTaskState = ReadingTaskState.WaitReading