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

修改提示

Uat_Study
hang 2022-07-21 15:24:59 +08:00
parent 01aabd5454
commit 5a9b60dfa0
2 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -306,6 +306,12 @@
<param name="applyId"> 申请记录的Id</param> <param name="applyId"> 申请记录的Id</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetInfluencedTaskList(System.Guid)">
<summary>
获取已影响的列表
</summary>
<returns></returns>
</member>
<member name="T:IRaCIS.Core.Application.Service.CommonDocumentService"> <member name="T:IRaCIS.Core.Application.Service.CommonDocumentService">
<summary> <summary>
系统模板文档配置表 系统模板文档配置表

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

@ -1161,16 +1161,24 @@ namespace IRaCIS.Core.Application.Service.Allocation
//origenalTask.ReReadingApplyState = agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Agree ? ReReadingApplyState.Agree : ReReadingApplyState.Reject; //origenalTask.ReReadingApplyState = agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Agree ? ReReadingApplyState.Agree : ReReadingApplyState.Reject;
//origenalTask.TaskState = agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Agree ? TaskState.HaveReturned : origenalTask.TaskState; //origenalTask.TaskState = agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Agree ? TaskState.HaveReturned : origenalTask.TaskState;
var origenalTask = (await _visitTaskRepository.Where(t => item.OriginalReReadingTaskId == t.Id).FirstOrDefaultAsync()).IfNullThrowException(); var origenalTask = (await _visitTaskRepository.Where(t => item.OriginalReReadingTaskId == t.Id).FirstOrDefaultAsync()).IfNullThrowException();
// 当前访视之前 已有任务申请 // 当前访视之前 已有任务申请
if (trialConfig.IsReadingTaskViewInOrder && await _visitTaskReReadingRepository.AnyAsync(t => t.OriginalReReadingTask.SubjectId == origenalTask.SubjectId && t.OriginalReReadingTask.TaskState == TaskState.Effect && t.OriginalReReadingTask.ReadingCategory == ReadingCategory.Visit if (trialConfig.IsReadingTaskViewInOrder )
&& t.OriginalReReadingTask.ReadingTaskState == ReadingTaskState.HaveSigned && t.OriginalReReadingTask.VisitTaskNum > origenalTask.VisitTaskNum && t.RequestReReadingResultEnum == RequestReReadingResult.Default))
{ {
return ResponseOutput.NotOk("当前为有序阅片，当前访视之后，也申请了重阅 必须从后向前处理");
var query = _visitTaskReReadingRepository.Where(t => t.OriginalReReadingTask.SubjectId == origenalTask.SubjectId && t.OriginalReReadingTask.TaskState == TaskState.Effect && t.OriginalReReadingTask.ReadingCategory == ReadingCategory.Visit
&& t.OriginalReReadingTask.ReadingTaskState == ReadingTaskState.HaveSigned && t.OriginalReReadingTask.VisitTaskNum > origenalTask.VisitTaskNum && t.RequestReReadingResultEnum == RequestReReadingResult.Default)
.Where(t => t.OriginalReReadingTask.IsAnalysisCreate == origenalTask.IsAnalysisCreate);
if(await query.AnyAsync())
{
return ResponseOutput.NotOk("当前为有序阅片，当前访视之后，也申请了重阅 必须从后向前处理");
}
} }
Expression<Func<VisitTask, bool>> filterExpression = t => t.TrialId == trialId && t.SubjectId == origenalTask.SubjectId && t.TaskState == TaskState.Effect; Expression<Func<VisitTask, bool>> filterExpression = t => t.TrialId == trialId && t.SubjectId == origenalTask.SubjectId && t.TaskState == TaskState.Effect;
@ -1215,7 +1223,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
//有序阅片 //有序阅片
if (trialConfig.IsReadingTaskViewInOrder) if (trialConfig.IsReadingTaskViewInOrder)
{ {
//访视影响当前以及当前之后的 两个阅片人的 //访视影响当前以及当前之后的 两个阅片人的
filterExpression = filterExpression.And(t => t.VisitTaskNum > origenalTask.VisitTaskNum && t.DoctorUserId == origenalTask.DoctorUserId || t.VisitTaskNum >= origenalTask.VisitTaskNum && t.DoctorUserId != origenalTask.DoctorUserId); filterExpression = filterExpression.And(t => t.VisitTaskNum > origenalTask.VisitTaskNum && t.DoctorUserId == origenalTask.DoctorUserId || t.VisitTaskNum >= origenalTask.VisitTaskNum && t.DoctorUserId != origenalTask.DoctorUserId);
@ -1270,7 +1278,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
{ {
influenceTask.TaskState = TaskState.Adbandon; influenceTask.TaskState = TaskState.Adbandon;
} }
} }
} }
#endregion #endregion
@ -1400,7 +1408,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
case ReadingCategory.Oncology: case ReadingCategory.Oncology:
//仅仅影响自己 后续任务如果是访视任务、全局任务或裁判任务，均不处理 //仅仅影响自己 后续任务如果是访视任务、全局任务或裁判任务，均不处理
filterExpression = filterExpression.And(t => t.Id == origenalTask.Id ); filterExpression = filterExpression.And(t => t.Id == origenalTask.Id);
break; break;
case ReadingCategory.Judge: case ReadingCategory.Judge:
@ -1840,7 +1848,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
{ {
influenceTask.TaskState = TaskState.Adbandon; influenceTask.TaskState = TaskState.Adbandon;
} }
} }
} }
@ -2280,5 +2288,15 @@ namespace IRaCIS.Core.Application.Service.Allocation
} }
/// <summary>
/// 获取已影响的列表
/// </summary>
/// <returns></returns>
public async Task<List<InfluenceTaskInfo>> GetInfluencedTaskList(Guid taskId)
{
var list = await _repository.Where<TaskInfluence>(t => t.OriginalTaskId == taskId).Select(t => t.OriginalTask).ProjectTo<InfluenceTaskInfo>(_mapper.ConfigurationProvider).ToListAsync();
return list;
}
} }
} }