修改标记
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
06d8e4bea8
commit
9636efcb56
|
@ -100,6 +100,26 @@ namespace IRaCIS.Core.Application.Service
|
||||||
var taskid = mark.VisitTaskId;
|
var taskid = mark.VisitTaskId;
|
||||||
await _readingTableQuestionAnswerRepository.BatchDeleteNoTrackingAsync(x => x.RowId == mark.RowId && x.TableQuestionId == mark.TableQuestionId);
|
await _readingTableQuestionAnswerRepository.BatchDeleteNoTrackingAsync(x => x.RowId == mark.RowId && x.TableQuestionId == mark.TableQuestionId);
|
||||||
await _readingTaskQuestionMarkRepository.DeleteFromQueryAsync(x => x.Id == inDto.Id);
|
await _readingTaskQuestionMarkRepository.DeleteFromQueryAsync(x => x.Id == inDto.Id);
|
||||||
|
|
||||||
|
|
||||||
|
await _readingTaskQuestionMarkRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.Id, x => new ReadingTaskQuestionMark()
|
||||||
|
{
|
||||||
|
InstanceId=null,
|
||||||
|
SeriesId = null,
|
||||||
|
StudyId = null,
|
||||||
|
MarkTool = string.Empty,
|
||||||
|
PicturePath = string.Empty,
|
||||||
|
NumberOfFrames = null,
|
||||||
|
MeasureData = string.Empty,
|
||||||
|
OrderMarkName = string.Empty,
|
||||||
|
OtherInstanceId = null,
|
||||||
|
OtherSeriesId = null,
|
||||||
|
OtherStudyId = null,
|
||||||
|
OtherMarkTool = string.Empty,
|
||||||
|
OtherPicturePath = string.Empty,
|
||||||
|
OtherNumberOfFrames = null,
|
||||||
|
OtherMeasureData = string.Empty,
|
||||||
|
});
|
||||||
var result= await _readingTaskQuestionMarkRepository.SaveChangesAsync();
|
var result= await _readingTaskQuestionMarkRepository.SaveChangesAsync();
|
||||||
|
|
||||||
await _readingCalculateService.CalculateTask(new CalculateTaskInDto()
|
await _readingCalculateService.CalculateTask(new CalculateTaskInDto()
|
||||||
|
@ -122,7 +142,24 @@ namespace IRaCIS.Core.Application.Service
|
||||||
[Route("/DeleteTableQuestionMark/{param}")]
|
[Route("/DeleteTableQuestionMark/{param}")]
|
||||||
public async Task<bool> DeleteTableQuestionMark(DeleteTableQuestionMarkInDto inDto, string param)
|
public async Task<bool> DeleteTableQuestionMark(DeleteTableQuestionMarkInDto inDto, string param)
|
||||||
{
|
{
|
||||||
await _readingTaskQuestionMarkRepository.DeleteFromQueryAsync(x => x.RowId == inDto.RowId);
|
await _readingTaskQuestionMarkRepository.UpdatePartialFromQueryAsync(x => x.RowId == inDto.RowId, x => new ReadingTaskQuestionMark()
|
||||||
|
{
|
||||||
|
InstanceId = null,
|
||||||
|
SeriesId = null,
|
||||||
|
StudyId = null,
|
||||||
|
MarkTool = string.Empty,
|
||||||
|
PicturePath = string.Empty,
|
||||||
|
NumberOfFrames = null,
|
||||||
|
MeasureData = string.Empty,
|
||||||
|
OrderMarkName = string.Empty,
|
||||||
|
OtherInstanceId = null,
|
||||||
|
OtherSeriesId = null,
|
||||||
|
OtherStudyId = null,
|
||||||
|
OtherMarkTool = string.Empty,
|
||||||
|
OtherPicturePath = string.Empty,
|
||||||
|
OtherNumberOfFrames = null,
|
||||||
|
OtherMeasureData = string.Empty,
|
||||||
|
});
|
||||||
return await _readingTaskQuestionMarkRepository.SaveChangesAsync();
|
return await _readingTaskQuestionMarkRepository.SaveChangesAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -137,7 +174,6 @@ namespace IRaCIS.Core.Application.Service
|
||||||
[Route("/SaveTableQuestionMark/{param}")]
|
[Route("/SaveTableQuestionMark/{param}")]
|
||||||
public async Task<SaveTableQuestionMarkInDto> SaveTableQuestionMark(SaveTableQuestionMarkInDto inDto, string param)
|
public async Task<SaveTableQuestionMarkInDto> SaveTableQuestionMark(SaveTableQuestionMarkInDto inDto, string param)
|
||||||
{
|
{
|
||||||
|
|
||||||
inDto.FristAddTaskId = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.TableQuestionId == inDto.TableQuestionId && x.RowId == inDto.RowId).Select(x => x.FristAddTaskId).FirstOrDefaultAsync();
|
inDto.FristAddTaskId = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.TableQuestionId == inDto.TableQuestionId && x.RowId == inDto.RowId).Select(x => x.FristAddTaskId).FirstOrDefaultAsync();
|
||||||
inDto.FristAddTaskId = inDto.FristAddTaskId == null ? inDto.VisitTaskId : inDto.FristAddTaskId;
|
inDto.FristAddTaskId = inDto.FristAddTaskId == null ? inDto.VisitTaskId : inDto.FristAddTaskId;
|
||||||
var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
|
var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
|
||||||
|
|
Loading…
Reference in New Issue