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

修改重阅列表

Uat_Study
hang 2023-07-07 11:21:38 +08:00
parent bd275539d1
commit d2251e4cb2
6 changed files with 16 additions and 1077 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/BackGroundJob/CancelTaskQuartZJob.cs
View File

@ -48,7 +48,7 @@ namespace IRaCIS.Application.Services.BackGroundJob
{ {
Guid id = (Guid)dataMap.Get("VisitTaskId"); Guid id = (Guid)dataMap.Get("VisitTaskId");
await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.Id == id, u => new VisitTask() { ClaimUserId = null }, true); await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.Id == id && t.ReadingTaskState!=ReadingTaskState.HaveSigned, u => new VisitTask() { DoctorUserId = null }, true);
} }
} }

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

@ -286,70 +286,6 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.BatchAssignDoctorToSubject(IRaCIS.Core.Application.ViewModel.BatchAssignDoctorToSubjectCommand)">
<summary>
一次性分配所有医生 批量分配(添加)，后端现在没限制
</summary>
<param name="command"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetDoctorSubjectStat(System.Guid,System.Guid)">
<summary>
阅片人维度 Subject统计表
</summary>
<param name="trialId"></param>
<param name="trialReadingCriterionId"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetSubjectAssignedDoctorList(System.Guid,System.Guid)">
<summary>
获取Subject 分配医生情况
</summary>
<param name="subjectId"></param>
<param name="trialReadingCriterionId"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.CancelSubjectAssignedDoctor(IRaCIS.Core.Application.ViewModel.CancelSubjectDoctorCommand)">
<summary>
取消Subject 分配的医生
</summary>
<param name="cancelCommand"></param>
<returns></returns>
<exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
</member>
<member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.AssignSubjectTaskToDoctor(IRaCIS.Core.Application.ViewModel.AssignSubjectTaskToDoctorCommand)">
<summary>
任务 手动分配 重新分配 确认 取消分配
</summary>分配
<param name="assignSubjectTaskToDoctorCommand"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetSubjectAssignList(IRaCIS.Core.Application.ViewModel.SubjectAssignQuery)">
<summary>
获取手动分配 未分配的Subject列表(IsHaveAssigned 传递false)
</summary>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.AssignSubjectDoctor(IRaCIS.Core.Application.ViewModel.AssginSubjectDoctorCommand)">
<summary>
批量为 多个Subject 分配医生 手动分配 IsReAssign 为true 批量删除 重新分配
</summary>
<param name="assginSubjectDoctorCommand"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.CancelSubjectAssignDoctor(IRaCIS.Core.Application.ViewModel.CancelSubjectAssignCommand)">
<summary>
批量取消Subject 分配的医生
</summary>
<returns></returns> 数量
</member>
<member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.ManualAssignDoctorApplyTask(IRaCIS.Core.Application.ViewModel.AssignConfirmCommand)">
<summary>
手动分配确认 绑定该Subject的已存在的任务给医生
</summary>
<param name="assignConfirmCommand"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.Allocation.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>
访视任务 访视任务

27
IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
View File

@ -108,33 +108,6 @@ namespace IRaCIS.Core.Application.ViewModel
public CriterionType CriterionType { get; set; } public CriterionType CriterionType { get; set; }
///// <summary>
///// 仲裁对象
///// </summary>
//public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.Reading;
///// <summary>
///// 阅片模式
///// </summary>
//public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double;
///// <summary>
///// 全局阅片
///// </summary>
//public bool IsGlobalReading { get; set; } = true;
///// <summary>
///// 仲裁阅片
///// </summary>
//public bool IsArbitrationReading { get; set; } = true;
///// <summary>
///// 肿瘤学阅片 原字段 IsClinicalReading
///// </summary>
//public bool IsOncologyReading { get; set; }
#endregion #endregion
} }

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

File diff suppressed because it is too large Load Diff

2
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
View File

@ -2535,7 +2535,7 @@ namespace IRaCIS.Application.Services
{ {
if (claimSubjectDto.IsClaim) if (claimSubjectDto.IsClaim)
{ {
await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.Id == claimSubjectDto.VisitTaskId, u => new VisitTask() { ClaimUserId = _userInfo.Id }, true); await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.Id == claimSubjectDto.VisitTaskId, u => new VisitTask() { DoctorUserId = _userInfo.Id }, true);
IJobDetail job = JobBuilder.Create<CancelTaskQuartZJob>() IJobDetail job = JobBuilder.Create<CancelTaskQuartZJob>()
.UsingJobData("VisitTaskId",(Guid) claimSubjectDto.VisitTaskId) // 传递GUID参数给任务 .UsingJobData("VisitTaskId",(Guid) claimSubjectDto.VisitTaskId) // 传递GUID参数给任务

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

@ -426,8 +426,6 @@ namespace IRaCIS.Core.Domain.Models
} }
} }
public Guid? ClaimUserId { get; set; }
} }
/// <summary> /// <summary>