Compare commits
No commits in common. "e69991ae37e9215a301bd7a719402d13bf6193ee" and "d569de4dfe0f89c876c9365c62b9ccd3d1e1201a" have entirely different histories.
e69991ae37
...
d569de4dfe
|
|
@ -3271,7 +3271,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
await _readingTableQuestionAnswerRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId);
|
await _readingTableQuestionAnswerRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId);
|
||||||
await _readingTaskQuestionMarkRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId);
|
await _readingTaskQuestionMarkRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId);
|
||||||
await _readingCustomTagRepository.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()
|
await _visitTaskRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.VisitTaskId, x => new VisitTask()
|
||||||
{
|
{
|
||||||
ReadingTaskState = ReadingTaskState.WaitReading
|
ReadingTaskState = ReadingTaskState.WaitReading
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -3577,13 +3577,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case "ReadingImageTask/resetReadingTask":
|
|
||||||
//跳转阅片结果需要该参数
|
|
||||||
|
|
||||||
obj.IsReadingReset = true;
|
|
||||||
|
|
||||||
break;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#region 裁判、肿瘤学、全局 都是通用的
|
#region 裁判、肿瘤学、全局 都是通用的
|
||||||
|
|
@ -3608,9 +3601,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
|
|
||||||
//增加进入阅片中的稽查
|
//增加进入阅片中的稽查
|
||||||
|
|
||||||
//重置阅片也会从待阅片 变为阅片中,因为复制病灶依赖这个改变
|
|
||||||
if (obj.IsReadingReset != true)
|
|
||||||
{
|
|
||||||
if (entity.ReadingTaskState == ReadingTaskState.Reading)
|
if (entity.ReadingTaskState == ReadingTaskState.Reading)
|
||||||
{
|
{
|
||||||
if(_dbContext.VisitTask.Where(t => t.Id == entity.Id).Any(t => t.ReadingTaskState== ReadingTaskState.WaitReading))
|
if(_dbContext.VisitTask.Where(t => t.Id == entity.Id).Any(t => t.ReadingTaskState== ReadingTaskState.WaitReading))
|
||||||
|
|
@ -3619,9 +3609,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
extraIdentification = "/ChangeToReading";
|
extraIdentification = "/ChangeToReading";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (entity.IsReadClinicalData == true)
|
if (entity.IsReadClinicalData == true)
|
||||||
{
|
{
|
||||||
|
|
@ -3633,7 +3620,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -62,8 +62,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
public string CutOffVisitName { get; set; }
|
public string CutOffVisitName { get; set; }
|
||||||
|
|
||||||
public string SelectResult { get; set; }
|
public string SelectResult { get; set; }
|
||||||
|
|
||||||
public bool? IsReadingReset { get;set; }
|
|
||||||
}
|
}
|
||||||
public class InspectionConvertDTO : DataInspection
|
public class InspectionConvertDTO : DataInspection
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue