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

修改任务生成

Uat_Study
hang 2022-07-19 13:14:59 +08:00
parent 3d996e2a15
commit 273bfcc2e8
4 changed files with 70 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,18 +171,18 @@
访视读片任务 访视读片任务
</summary> </summary>
</member> </member>
<member name="T:IRaCIS.Core.Application.Service.VisitTaskService"> <member name="T:IRaCIS.Core.Application.Service.Allocation.VisitTaskService">
<summary> <summary>
访视读片任务 访视读片任务
</summary> </summary>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.VisitTaskService.GetSubjectAssignList(IRaCIS.Core.Application.ViewModel.SubjectAssignQuery)"> <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetSubjectAssignList(IRaCIS.Core.Application.ViewModel.SubjectAssignQuery)">
<summary> <summary>
获取手动分配 未分配的Subject列表(IsHaveAssigned 传递false) 获取手动分配 未分配的Subject列表(IsHaveAssigned 传递false)
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.VisitTaskService.GetVisitTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery,IRaCIS.Core.Application.Service.IVisitTaskHelpeService)"> <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetVisitTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery,IRaCIS.Core.Application.Service.IVisitTaskHelpeService)">
<summary> <summary>
获取随访 阅片期 全局 任务列表 获取随访 阅片期 全局 任务列表
</summary> </summary>
@ -190,102 +190,102 @@
<param name="_visitTaskCommonService"></param> <param name="_visitTaskCommonService"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.VisitTaskService.GetJudgeVisitTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery)"> <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetJudgeVisitTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery)">
<summary> <summary>
获取裁判访视任务列表 获取裁判访视任务列表
</summary> </summary>
<param name="queryVisitTask"></param> <param name="queryVisitTask"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.VisitTaskService.GetReadingTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery)"> <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetReadingTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery)">
<summary> <summary>
获取影像阅片列表 相比而言多了几个字段 和配置信息 获取影像阅片列表 相比而言多了几个字段 和配置信息
</summary> </summary>
<param name="queryVisitTask"></param> <param name="queryVisitTask"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.VisitTaskService.GetReReadingTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery)"> <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetReReadingTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery)">
<summary> <summary>
PM 重阅追踪 PM 重阅追踪
</summary> </summary>
<param name="queryVisitTask"></param> <param name="queryVisitTask"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.VisitTaskService.GetIRReReadingTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery)"> <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetIRReReadingTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery)">
<summary> <summary>
获取IR 重阅影像阅片列表 获取IR 重阅影像阅片列表
</summary> </summary>
<param name="queryVisitTask"></param> <param name="queryVisitTask"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.VisitTaskService.GetIRUnReadSubjectTaskList(IRaCIS.Core.Application.ViewModel.IRUnReadSubjectQuery)"> <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetIRUnReadSubjectTaskList(IRaCIS.Core.Application.ViewModel.IRUnReadSubjectQuery)">
<summary> <summary>
IR 待阅片任务列表 IR 待阅片任务列表
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.VisitTaskService.GetIRHaveReadTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery)"> <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetIRHaveReadTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery)">
<summary> <summary>
IR 已阅片任务 IR 已阅片任务
</summary> </summary>
<param name="queryVisitTask"></param> <param name="queryVisitTask"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.VisitTaskService.AssignSubjectDoctor(IRaCIS.Core.Application.ViewModel.AssginSubjectDoctorCommand)"> <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.AssignSubjectDoctor(IRaCIS.Core.Application.ViewModel.AssginSubjectDoctorCommand)">
<summary> <summary>
批量为 多个Subject 分配医生 手动分配 IsReAssign 为true 批量删除 重新分配 批量为 多个Subject 分配医生 手动分配 IsReAssign 为true 批量删除 重新分配
</summary> </summary>
<param name="assginSubjectDoctorCommand"></param> <param name="assginSubjectDoctorCommand"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.VisitTaskService.CancelSubjectAssignDoctor(IRaCIS.Core.Application.ViewModel.CancelSubjectAssignCommand)"> <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.CancelSubjectAssignDoctor(IRaCIS.Core.Application.ViewModel.CancelSubjectAssignCommand)">
<summary> <summary>
批量取消Subject 分配的医生 批量取消Subject 分配的医生
</summary> </summary>
<returns></returns> 数量 <returns></returns> 数量
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.VisitTaskService.ManualAssignDoctorApplyTask(IRaCIS.Core.Application.ViewModel.AssignConfirmCommand)"> <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.ManualAssignDoctorApplyTask(IRaCIS.Core.Application.ViewModel.AssignConfirmCommand)">
<summary> <summary>
手动分配确认 绑定该Subject的已存在的任务给医生 手动分配确认 绑定该Subject的已存在的任务给医生
</summary> </summary>
<param name="assignConfirmCommand"></param> <param name="assignConfirmCommand"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.VisitTaskService.AutoSubjectAssignDoctor(IRaCIS.Core.Application.ViewModel.AutoSubjectAssignCommand)"> <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.AutoSubjectAssignDoctor(IRaCIS.Core.Application.ViewModel.AutoSubjectAssignCommand)">
<summary> <summary>
自动一次性分配所有未分配的 Subject 给医生 自动一次性分配所有未分配的 Subject 给医生
</summary> </summary>
<param name="autoSubjectAssignCommand"></param> <param name="autoSubjectAssignCommand"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.VisitTaskService.AssignSubjectTaskToDoctor(IRaCIS.Core.Application.ViewModel.AssignSubjectTaskToDoctorCommand)"> <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.AssignSubjectTaskToDoctor(IRaCIS.Core.Application.ViewModel.AssignSubjectTaskToDoctorCommand)">
<summary> <summary>
任务 手动分配 重新分配 确认 取消分配 任务 手动分配 重新分配 确认 取消分配
</summary>分配 </summary>分配
<param name="assignSubjectTaskToDoctorCommand"></param> <param name="assignSubjectTaskToDoctorCommand"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.VisitTaskService.ApplyReReading(IRaCIS.Core.Application.ViewModel.ApplyReReadingCommand)"> <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.ApplyReReading(IRaCIS.Core.Application.ViewModel.ApplyReReadingCommand)">
<summary> <summary>
申请重阅 1:IR 2:PM 申请重阅 1:IR 2:PM
</summary> </summary>
<param name="applyReReadingCommand"></param> <param name="applyReReadingCommand"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.VisitTaskService.ConfirmReReading(IRaCIS.Core.Application.ViewModel.ConfirmReReadingCommand,IRaCIS.Core.Application.Service.IVisitTaskHelpeService)"> <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.ConfirmReReading(IRaCIS.Core.Application.ViewModel.ConfirmReReadingCommand,IRaCIS.Core.Application.Service.IVisitTaskHelpeService)">
<summary> <summary>
确认重阅与否 1同意 2 拒绝 确认重阅与否 1同意 2 拒绝
</summary> </summary>
<param name="agreeReReadingCommand"></param> <param name="agreeReReadingCommand"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.VisitTaskService.PMSetTaskBack(System.Guid,System.Guid)"> <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.PMSetTaskBack(System.Guid,System.Guid)">
<summary> <summary>
PM 设置任务 退回 PM 设置任务 退回
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.VisitTaskService.GetReReadingOrBackInfluenceTaskList(System.Guid,System.Boolean,System.Nullable{System.Guid})"> <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetReReadingOrBackInfluenceTaskList(System.Guid,System.Boolean,System.Nullable{System.Guid})">
<summary> <summary>
影响提示列表 重阅仅仅针对已完成的任务申请 退回针对的是未完成的(退回仅仅针对是访视类型的) 影响提示列表 重阅仅仅针对已完成的任务申请 退回针对的是未完成的(退回仅仅针对是访视类型的)
</summary> </summary>

30
IRaCIS.Core.Application/Service/Allocation/DTO/TaskConsistentRuleViewModel.cs
View File

@ -173,6 +173,36 @@ namespace IRaCIS.Core.Application.ViewModel
// //public List<UserSimpleInfo> HistoryDoctorUserList => VisitTaskList.SelectMany(t => t.RelationDoctorUserList).DistinctBy(t=>t.UserId).ToList(); // //public List<UserSimpleInfo> HistoryDoctorUserList => VisitTaskList.SelectMany(t => t.RelationDoctorUserList).DistinctBy(t=>t.UserId).ToList();
//} //}
public class InfluenceTaskInfo
{
public Guid Id { get; set; }
public Guid TrialId { get; set; }
public Guid SiteId { get; set; }
public Guid SubjectId { get; set; }
public Arm ArmEnum { get; set; }
public string TaskCode { get; set; }
public string TaskName { get; set; }
public string TaskBlindName { get; set; }
public decimal VisitTaskNum { get; set; }
public ReadingCategory ReadingCategory { get; set; }
//任务阅片状态
public ReadingTaskState ReadingTaskState { get; set; }
public TaskState TaskState { get; set; }
public String TrialSiteCode { get; set; } = String.Empty;
public string SubjectCode { get; set; } = String.Empty;
public UserSimpleInfo DoctorUser { get; set; }
}
public class VisitTaskSimpleView public class VisitTaskSimpleView
{ {
public Guid Id { get; set; } public Guid Id { get; set; }

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

@ -1283,11 +1283,12 @@ namespace IRaCIS.Core.Application.Service.Allocation
//影响后续访视已经读完的，未读的不做处理 以及其他类型任务 //影响后续访视已经读完的，未读的不做处理 以及其他类型任务
filterExpression = filterExpression.And(t => t.VisitTaskNum > origenalTask.VisitTaskNum && t.DoctorUserId == origenalTask.DoctorUserId && filterExpression = filterExpression.And(t => t.VisitTaskNum > origenalTask.VisitTaskNum && t.DoctorUserId == origenalTask.DoctorUserId &&
(t.ReadingTaskState == ReadingTaskState.HaveSigned && t.ReadingCategory == ReadingCategory.Visit || (t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState==ReadingTaskState.HaveSigned ||
t.ReadingCategory == ReadingCategory.Global || t.ReadingCategory == ReadingCategory.Global ||
t.ReadingCategory == ReadingCategory.Oncology || t.ReadingCategory == ReadingCategory.Oncology ||
t.ReadingCategory == ReadingCategory.Judge) t.ReadingCategory == ReadingCategory.Judge)
); )
;
break; break;
case ReadingCategory.Global: case ReadingCategory.Global:
@ -1327,41 +1328,16 @@ namespace IRaCIS.Core.Application.Service.Allocation
foreach (var influenceTask in influenceTaskList) foreach (var influenceTask in influenceTaskList)
{ {
if (influenceTask.ReadingTaskState == ReadingTaskState.HaveSigned)
{
influenceTask.TaskState = TaskState.HaveReturned;
}
else
{
influenceTask.TaskState = TaskState.Adbandon;
}
//影响其他的任务 如果是访视类型 需要重新生成
if (influenceTask.ReadingCategory == ReadingCategory.Visit) if (influenceTask.ReadingTaskState == ReadingTaskState.HaveSigned)
{
await _visitTaskCommonService.AddTaskAsync(new GenerateTaskCommand()
{ {
TrialId = trialId, influenceTask.TaskState = TaskState.HaveReturned;
}
ReadingCategory = GenerateTaskCategory.ReReading, else
{
ReReadingTask = origenalTask, influenceTask.TaskState = TaskState.Adbandon;
}
//同步才可以
Action = (newTask) =>
{
//申请表 设置新任务Id
visitTaskReReadingAppply.NewReReadingTaskId = newTask.Id;
//生成的任务分配给原始医生
newTask.DoctorUserId = origenalTask.DoctorUserId;
newTask.TaskAllocationState = TaskAllocationState.Allocated;
newTask.AllocateTime = DateTime.Now;
}
});
}
} }
#endregion #endregion
@ -1764,7 +1740,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
/// <param name="isReReading"></param> /// <param name="isReReading"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("{taskId:guid}/{isReReading:bool}")] [HttpGet("{taskId:guid}/{isReReading:bool}")]
public async Task<List<VisitTaskSimpleView>> GetReReadingOrBackInfluenceTaskList(Guid taskId, bool isReReading, Guid? applyId) public async Task<List<InfluenceTaskInfo>> GetReReadingOrBackInfluenceTaskList(Guid taskId, bool isReReading, Guid? applyId)
{ {
var filterObj = (await _visitTaskRepository.FirstOrDefaultNoTrackingAsync(t => t.Id == taskId)).IfNullThrowException(); var filterObj = (await _visitTaskRepository.FirstOrDefaultNoTrackingAsync(t => t.Id == taskId)).IfNullThrowException();
var trialId = filterObj.TrialId; var trialId = filterObj.TrialId;
@ -1795,15 +1771,16 @@ namespace IRaCIS.Core.Application.Service.Allocation
switch (filterObj.ReadingCategory) switch (filterObj.ReadingCategory)
{ {
case ReadingCategory.Visit: case ReadingCategory.Visit:
//影响当前医生 以及当前医生之后的 1、访视任务 已经读完的，(未读完的或者未读的 不处理) //影响当前医生 以及当前医生之后的 1、访视任务 已经读完的
//2、后续任务如果是全局、肿瘤学阅片任务，状态为阅片完成标记为重阅重置；若在阅片中，则标记为失效；若为待阅片，则标记为失效； //2、后续任务如果是全局、肿瘤学阅片任务，状态为阅片完成标记为重阅重置；若在阅片中，则标记为失效；若为待阅片，则标记为失效；
//3、当前任务、后续访视任务或者全局任务触发了裁判任务，若裁判任务状态为阅片完成，则标记为重阅重置；若在阅片中或待阅片，则标记为失效 //3、当前任务、后续访视任务或者全局任务触发了裁判任务，若裁判任务状态为阅片完成，则标记为重阅重置；若在阅片中或待阅片，则标记为失效
filterExpression = filterExpression.And(t => t.VisitTaskNum >= filterObj.VisitTaskNum && t.DoctorUserId == filterObj.DoctorUserId && filterExpression = filterExpression.And(t => t.VisitTaskNum >= filterObj.VisitTaskNum && t.DoctorUserId == filterObj.DoctorUserId &&
(t.ReadingTaskState == ReadingTaskState.HaveSigned && t.ReadingCategory == ReadingCategory.Visit || (t.ReadingCategory == ReadingCategory.Visit &&t.ReadingTaskState==ReadingTaskState.HaveSigned||
t.ReadingCategory == ReadingCategory.Global || t.ReadingCategory == ReadingCategory.Global ||
t.ReadingCategory == ReadingCategory.Oncology || t.ReadingCategory == ReadingCategory.Oncology ||
t.ReadingCategory == ReadingCategory.Judge) t.ReadingCategory == ReadingCategory.Judge)
); )
;
break; break;
case ReadingCategory.Global: case ReadingCategory.Global:
@ -1943,7 +1920,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
} }
var list = await _visitTaskRepository.Where(filterExpression).OrderBy(t => t.VisitTaskNum).ProjectTo<VisitTaskSimpleView>(_mapper.ConfigurationProvider).ToListAsync(); var list = await _visitTaskRepository.Where(filterExpression).OrderBy(t => t.VisitTaskNum).ProjectTo<InfluenceTaskInfo>(_mapper.ConfigurationProvider).ToListAsync();
return list; return list;

6
IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs
View File

@ -217,7 +217,11 @@ namespace IRaCIS.Core.Application.Service
.ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode)) .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode))
.ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code)); .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code));
CreateMap<VisitTask, InfluenceTaskInfo>()
//.ForMember(o => o.DoctorUser, t => t.MapFrom(u => u.DoctorUser))
.ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode))
.ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code));
} }
} }