任务修改

This commit is contained in:
2022-06-23 15:36:39 +08:00
parent 9dcdb96d14
commit cbefc3854e
5 changed files with 53 additions and 31 deletions
@@ -286,10 +286,21 @@ namespace IRaCIS.Core.Application.Service
foreach (var reReadingVisitTask in generateTaskCommand.ReReadingTaskList)
{
reReadingVisitTask.OriginalReReadingId = reReadingVisitTask.Id;
reReadingVisitTask.Id = Guid.Empty;
reReadingVisitTask. Code = currentMaxCodeInt + 1;
reReadingVisitTask.TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask));
//reReadingVisitTask.OriginalReReadingId = reReadingVisitTask.Id;
//reReadingVisitTask.Id = Guid.Empty;
//reReadingVisitTask. Code = currentMaxCodeInt + 1;
//reReadingVisitTask.TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask));
await _visitTaskRepository.AddAsync(new VisitTask()
{
OriginalReReadingId=reReadingVisitTask.Id,
Code = currentMaxCodeInt + 1,
TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)),
AllocateTime=DateTime.Now,
DoctorUserId= reReadingVisitTask.DoctorUserId
});
//是否增加任务类别
@@ -297,7 +308,6 @@ namespace IRaCIS.Core.Application.Service
_provider.Set<int>($"{trialId}_{StaticData.CacheKey.TaskMaxCode}", currentMaxCodeInt + 1, TimeSpan.FromMinutes(30));
await _visitTaskRepository.AddAsync(reReadingVisitTask);
}
break;
@@ -904,11 +904,14 @@ namespace IRaCIS.Core.Application.Service
{
if(task.ReadingTaskState==ReadingTaskState.WaitReading || task.ReadingTaskState == ReadingTaskState.Reading)
{
task.JudgeVisitTask.ReadingTaskState = ReadingTaskState.HaveCanceled;
}
else
{
task.JudgeVisitTask.IsJudgeTaskReturn = true;
task.JudgeVisitTask.ReadingTaskState = ReadingTaskState.HaveReturned;
//task.JudgeVisitTask.IsJudgeTaskReturn = true;
}
}