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

任务修改

Uat_Study
hang 2022-06-23 15:36:39 +08:00
parent 9dcdb96d14
commit cbefc3854e
5 changed files with 53 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
View File

@ -286,10 +286,21 @@ namespace IRaCIS.Core.Application.Service
foreach (var reReadingVisitTask in generateTaskCommand.ReReadingTaskList) foreach (var reReadingVisitTask in generateTaskCommand.ReReadingTaskList)
{ {
reReadingVisitTask.OriginalReReadingId = reReadingVisitTask.Id; //reReadingVisitTask.OriginalReReadingId = reReadingVisitTask.Id;
reReadingVisitTask.Id = Guid.Empty; //reReadingVisitTask.Id = Guid.Empty;
reReadingVisitTask. Code = currentMaxCodeInt + 1; //reReadingVisitTask. Code = currentMaxCodeInt + 1;
reReadingVisitTask.TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)); //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)); _provider.Set<int>($"{trialId}_{StaticData.CacheKey.TaskMaxCode}", currentMaxCodeInt + 1, TimeSpan.FromMinutes(30));
await _visitTaskRepository.AddAsync(reReadingVisitTask);
} }
break; break;

7
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
View File

@ -904,11 +904,14 @@ namespace IRaCIS.Core.Application.Service
{ {
if(task.ReadingTaskState==ReadingTaskState.WaitReading || task.ReadingTaskState == ReadingTaskState.Reading) if(task.ReadingTaskState==ReadingTaskState.WaitReading || task.ReadingTaskState == ReadingTaskState.Reading)
{ {
task.JudgeVisitTask.ReadingTaskState = ReadingTaskState.HaveCanceled;
} }
else else
{ {
task.JudgeVisitTask.IsJudgeTaskReturn = true;
task.JudgeVisitTask.ReadingTaskState = ReadingTaskState.HaveReturned;
//task.JudgeVisitTask.IsJudgeTaskReturn = true;
} }
} }

12
IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs
View File

@ -37,8 +37,7 @@ namespace IRaCIS.Core.Domain.Share
//已分配 //已分配
Allocated = 2, Allocated = 2,
//已取消
HaveCanceled=3
} }
public enum Arm public enum Arm
@ -101,7 +100,12 @@ namespace IRaCIS.Core.Domain.Share
Reading = 1, Reading = 1,
HaveSigned=2 HaveSigned = 2,
// 裁判任务，没做，或者做了没签名 已取消
HaveCanceled = 3,
HaveReturned = 4
} }
// //
@ -109,8 +113,10 @@ namespace IRaCIS.Core.Domain.Share
{ {
Default = 0, Default = 0,
//IR 申请
DocotorApply = 1, DocotorApply = 1,
//PM 申请
TrialGroupApply = 2 TrialGroupApply = 2
} }

3
IRaCIS.Core.Domain/Allocation/VisitTask.cs
View File

@ -134,8 +134,11 @@ namespace IRaCIS.Core.Domain.Models
public TaskAllocationRule DoctorTaskAllocationRule { get; set; } public TaskAllocationRule DoctorTaskAllocationRule { get; set; }
//裁判任务已读，但是回退了 暂时废弃
public bool IsJudgeTaskReturn { get; set; } public bool IsJudgeTaskReturn { get; set; }
//是否回退过 //是否回退过
public bool IsReturned { get; set; } public bool IsReturned { get; set; }

6
IRaCIS.Core.Domain/Trial/Trial.cs
View File

@ -330,13 +330,13 @@ namespace IRaCIS.Core.Domain.Models
public bool IsFollowJudgeTaskAutoAssign { get; set; } public bool IsFollowJudgeTaskAutoAssign { get; set; }
public TaskAllocateDefaultState FollowJudgeTaskAutoAssignDefaultState { get; set; } public TaskAllocateDefaultState FollowJudgeTaskAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated;
//后续访视自动分配默认状态 //后续访视自动分配默认状态
public TaskAllocateDefaultState FollowVisitAutoAssignDefaultState { get; set; } public TaskAllocateDefaultState FollowVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated;
//后续全局自动分配默认状态 //后续全局自动分配默认状态
public TaskAllocateDefaultState FollowGlobalVisitAutoAssignDefaultState { get; set; } public TaskAllocateDefaultState FollowGlobalVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated;
//读片任务显示规则 //读片任务显示规则