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

@@ -1,15 +1,10 @@
 using Amazon.Runtime.Internal.Auth;
-using DocumentFormat.OpenXml.Drawing.Spreadsheet;
-using DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.MsForms;
-using DocumentFormat.OpenXml.Office2010.Excel;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.Service.Reading.Dto;
 using IRaCIS.Core.Application.ViewModel;
-using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infra.EFCore.Common;
-using IRaCIS.Core.Infra.EFCore.Migrations;
 using MassTransit;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
@@ -104,34 +99,22 @@ namespace IRaCIS.Core.Application.Service
                     await _readingNoneDicomMarkRepository.AddAsync(mark);
                 }
 
-
-                var binding = await _readingNoneDicomMarkBindingRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId &&
+                await _readingNoneDicomMarkBindingRepository.BatchDeleteNoTrackingAsync(x =>
+                                x.VisitTaskId == inDto.VisitTaskId &&
                                 x.QuestionId == inDto.QuestionId &&
                                 x.RowId == inDto.RowId &&
-                                x.TableQuestionId == inDto.TableQuestionId).FirstOrDefaultAsync();
-                if (binding == null)
+                                x.TableQuestionId == inDto.TableQuestionId);
+
+                await _readingNoneDicomMarkBindingRepository.AddAsync(new ReadingNoneDicomMarkBinding()
                 {
-                    await _readingNoneDicomMarkBindingRepository.AddAsync(new ReadingNoneDicomMarkBinding()
-                    {
-                        Id = NewId.NextGuid(),
-                        VisitTaskId = inDto.VisitTaskId,
-                        QuestionId = inDto.QuestionId,
-                        RowId = inDto.RowId,
-                        TableQuestionId = inDto.TableQuestionId,
-                        NoneDicomMarkId = mark.Id,
-                        MarkId = mark.MarkId
-                    });
-                }
-                else
-                {
-                    await _readingNoneDicomMarkBindingRepository.UpdatePartialFromQueryAsync(binding.Id,x=> new ReadingNoneDicomMarkBinding()
-                    {
-                        NoneDicomMarkId = mark.Id,
-                        MarkId = mark.MarkId
-                    });
-                }
-                  
-                
+                    Id = NewId.NextGuid(),
+                    VisitTaskId = inDto.VisitTaskId,
+                    QuestionId = inDto.QuestionId,
+                    RowId = inDto.RowId,
+                    TableQuestionId = inDto.TableQuestionId,
+                    NoneDicomMarkId = mark.Id,
+                    MarkId = mark.MarkId
+                });
 
 
 

IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs

@@ -3643,33 +3643,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 var type = GetEntityAuditOpt(item);
 
                 var entity = item.Entity as ReadingNoneDicomMarkBinding;
-                var selfDefineIdentification = string.Empty;
-                switch (type)
-                {
-                    case "Add":
-                        selfDefineIdentification = "SaveTaskQuestion/-10/ReadingTaskQuestionAnswer/Add/AddMark";
-                        break;
-                    case "Update":
-                        selfDefineIdentification = "SaveTaskQuestion/-10/ReadingTaskQuestionAnswer/Add/UpdateMark";
-                        break;
-                    case "Deleted":
-                        selfDefineIdentification = "SaveTaskQuestion/-10/ReadingTaskQuestionAnswer/Add/DeleteMark";
-                        break;
-                }
 
-                var answer = entitys.Where(x => x.Entity.GetType() == typeof(ReadingTaskQuestionAnswer)).FirstOrDefault();
-
-                var mark= entitys.Where(x => x.Entity.GetType() == typeof(ReadingNoneDicomMark)).Select(x=>x.Entity as ReadingNoneDicomMark).FirstOrDefault();
-                if (mark == null)
-                {
-                    mark = await _dbContext.ReadingNoneDicomMark.Where(x => x.Id == entity.NoneDicomMarkId).FirstOrDefaultAsync();
-
-                }
-                var QuestionName = string.Empty;
-                if (answer != null)
-                {
-                    QuestionName= _dbContext.ReadingQuestionTrial.Where(x => x.Id == (answer.Entity as ReadingTaskQuestionAnswer).ReadingQuestionTrialId).Select(x => _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName).FirstOrDefault();
-                }
                 //var selfDefineIdentification = "ReadingImageTask/submitCustomTag/ReadingTaskQuestionMark/";
                 //if (type == "Deleted")
                 //{
@@ -3678,14 +3652,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 await InsertInspection<ReadingNoneDicomMarkBinding>(entity, type, x => new InspectionConvertDTO()
                 {
-                    SelfDefineIdentification = selfDefineIdentification,
+                    //SelfDefineIdentification = selfDefineIdentification + type
 
                 }, new
                 {
-                    MarkName= mark==null|| type== "Deleted" ? string.Empty: mark.OrderMarkName,
-                    PicturePath= mark == null ? string.Empty : mark.PicturePath,
-                    QuestionName = QuestionName,
-                    QuestinonAnswer= answer==null?string.Empty:(answer.Entity as ReadingTaskQuestionAnswer).Answer
+
                 });
             }