XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

保存答案和非Dicom标记绑定关系
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
he 2025-10-21 11:29:11 +08:00
parent 473cee0e30
commit 487eb9dca8
2 changed files with 124 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
View File

@ -2488,9 +2488,21 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class AddNoneDicomMarkAndBinding
{
public Guid VisitTaskId { get; set; }
public AddNoneDicomMarkInDto MarkInfo { get; set; }
public Guid? StudyId { get; set; }
public List<BindingInfo> BindingList { get; set; }
public Guid? MarkId { get; set; }
public Guid? NoneDicomFileId { get; set; }
public string Path { get; set; }
public string MeasureData { get; set; } = string.Empty;
public Guid QuestionId { get; set; }
public Guid? RowId { get; set; }
public Guid? TableQuestionId { get; set; }
public string Answer { get; set; }
}
public class BindingInfo

136
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs
View File

@ -1,4 +1,5 @@
using IRaCIS.Core.Application.Contracts;
using Amazon.Runtime.Internal.Auth;
using IRaCIS.Core.Application.Contracts;
using IRaCIS.Core.Application.Filter;
using IRaCIS.Core.Application.Service.Reading.Dto;
using IRaCIS.Core.Application.ViewModel;
@ -33,41 +34,124 @@ namespace IRaCIS.Core.Application.Service
}
/// <summary>
/// 添加非Dicom标记并绑定
/// 保存答案和非Dicom标记绑定关系
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
[HttpPost]
public async Task<IResponseOutput> AddNoneDicomMarkAndBinding(AddNoneDicomMarkAndBinding inDto)
public async Task<IResponseOutput> SaveAnswerAndBindingNoneDicomMark(AddNoneDicomMarkAndBinding inDto)
{
ReadingNoneDicomMark? mark = await _readingNoneDicomMarkRepository.Where(x => x.MarkId == inDto.MarkInfo.MarkId).FirstOrDefaultAsync();
if (mark == null)
var visitTask = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
// 说明要移除标记数据
if (inDto.MeasureData == string.Empty)
{
mark = await _readingNoneDicomMarkRepository.InsertOrUpdateAsync(new AddNoneDicomMarkInDto()
// 先找到绑定关系
var binding = await _readingNoneDicomMarkBindingRepository.Where(x =>
x.VisitTaskId == inDto.VisitTaskId &&
x.QuestionId == inDto.QuestionId &&
x.RowId == inDto.RowId &&
x.TableQuestionId == inDto.TableQuestionId).FirstOrDefaultAsync();
if (binding != null)
{
MarkId = inDto.MarkInfo.MarkId,
MeasureData = inDto.MarkInfo.MeasureData,
NoneDicomFileId = inDto.MarkInfo.NoneDicomFileId,
Path = inDto.MarkInfo.Path,
StudyId = inDto.MarkInfo.StudyId,
VisitTaskId = inDto.VisitTaskId
}, true);
if ((await _readingNoneDicomMarkBindingRepository.Where(x => x.NoneDicomMarkId == binding.NoneDicomMarkId).CountAsync()) == 1)
{
await _readingNoneDicomMarkBindingRepository.DeleteFromQueryAsync(x => x.Id == binding.Id);
}
}
}
else
{
// 找到标记信息
var mark = await _readingNoneDicomMarkRepository.Where(x => x.MarkId == inDto.MarkId).FirstOrDefaultAsync();
if (mark != null)
{
if (mark.MeasureData != inDto.MeasureData || mark.Path != inDto.Path)
{
await _readingNoneDicomMarkRepository.UpdatePartialFromQueryAsync(x => x.Id == mark.Id, u => new Domain.Models.ReadingNoneDicomMark()
{
MeasureData = inDto.MeasureData,
Path = inDto.Path
});
}
}
else
{
// 添加标记信息
mark = new ReadingNoneDicomMark()
{
Id = NewId.NextGuid(),
VisitTaskId = inDto.VisitTaskId,
StudyId = inDto.StudyId,
NoneDicomFileId = inDto.NoneDicomFileId,
Path = inDto.Path,
MeasureData = inDto.MeasureData,
MarkId = inDto.MarkId
};
await _readingNoneDicomMarkRepository.AddAsync(mark);
}
await _readingNoneDicomMarkBindingRepository.BatchDeleteNoTrackingAsync(x =>
x.VisitTaskId == inDto.VisitTaskId &&
x.QuestionId == inDto.QuestionId &&
x.RowId == inDto.RowId &&
x.TableQuestionId == inDto.TableQuestionId);
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
});
}
List<ReadingNoneDicomMarkBinding> markBindings = inDto.BindingList.Select(x => new ReadingNoneDicomMarkBinding()
{
MarkId = mark.MarkId,
VisitTaskId = inDto.VisitTaskId,
QuestionId = x.QuestionId,
RowId = x.RowId,
TableQuestionId = x.TableQuestionId,
NoneDicomMarkId = mark.Id
}).ToList();
// 处理答案
await _readingNoneDicomMarkBindingRepository.AddRangeAsync(markBindings);
await _readingNoneDicomMarkBindingRepository.SaveChangesAsync();
return ResponseOutput.Ok(mark.Id);
if (inDto.RowId == null)
{
await _readingTaskQuestionAnswerRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId && x.ReadingQuestionTrialId == inDto.QuestionId);
await _readingTaskQuestionAnswerRepository.AddAsync(new ReadingTaskQuestionAnswer()
{
Id = NewId.NextGuid(),
SubjectId = visitTask.SubjectId,
Answer = inDto.Answer,
ReadingQuestionTrialId = inDto.QuestionId,
VisitTaskId = inDto.VisitTaskId,
TrialId = visitTask.TrialId
});
}
else
{
await _readingTableQuestionAnswerRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId && x.RowId == inDto.RowId&&x.TableQuestionId==inDto.TableQuestionId);
var rowinfo=await _readingTableAnswerRowInfoRepository.Where(x => x.Id == inDto.RowId.Value).FirstNotNullAsync();
await _readingTableQuestionAnswerRepository.AddAsync(new ReadingTableQuestionAnswer()
{
Id = NewId.NextGuid(),
RowId = inDto.RowId.Value,
Answer = inDto.Answer,
QuestionId= inDto.QuestionId,
TableQuestionId= inDto.TableQuestionId.Value,
VisitTaskId = inDto.VisitTaskId,
TrialId = visitTask.TrialId,
RowIndex= rowinfo.RowIndex,
});
}
await _visitTaskRepository.SaveChangesAsync();
return ResponseOutput.Ok();
}
/// <summary>