稽查修改
This commit is contained in:
+30
-13
@@ -1,10 +1,15 @@
|
||||
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;
|
||||
@@ -99,22 +104,34 @@ namespace IRaCIS.Core.Application.Service
|
||||
await _readingNoneDicomMarkRepository.AddAsync(mark);
|
||||
}
|
||||
|
||||
await _readingNoneDicomMarkBindingRepository.BatchDeleteNoTrackingAsync(x =>
|
||||
x.VisitTaskId == inDto.VisitTaskId &&
|
||||
|
||||
var binding = await _readingNoneDicomMarkBindingRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId &&
|
||||
x.QuestionId == inDto.QuestionId &&
|
||||
x.RowId == inDto.RowId &&
|
||||
x.TableQuestionId == inDto.TableQuestionId);
|
||||
|
||||
await _readingNoneDicomMarkBindingRepository.AddAsync(new ReadingNoneDicomMarkBinding()
|
||||
x.TableQuestionId == inDto.TableQuestionId).FirstOrDefaultAsync();
|
||||
if (binding == null)
|
||||
{
|
||||
Id = NewId.NextGuid(),
|
||||
VisitTaskId = inDto.VisitTaskId,
|
||||
QuestionId = inDto.QuestionId,
|
||||
RowId = inDto.RowId,
|
||||
TableQuestionId = inDto.TableQuestionId,
|
||||
NoneDicomMarkId = mark.Id,
|
||||
MarkId = mark.MarkId
|
||||
});
|
||||
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
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user