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

批量重新分配

Uat_Study
hang 2022-06-10 15:55:03 +08:00
parent 0d6db93e67
commit ec193d7794
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,7 @@
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.VisitTaskService.AssignSubjectDoctor(IRaCIS.Core.Application.ViewModel.AssginSubjectDoctorCommand)"> <member name="M:IRaCIS.Core.Application.Service.VisitTaskService.AssignSubjectDoctor(IRaCIS.Core.Application.ViewModel.AssginSubjectDoctorCommand)">
<summary> <summary>
批量为 多个Subject 分配医生 手动分配 批量为 多个Subject 分配医生 手动分配 IsReAssign 为true 批量删除 重新分配
</summary> </summary>
<param name="assginSubjectDoctorCommand"></param> <param name="assginSubjectDoctorCommand"></param>
<returns></returns> <returns></returns>

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

@ -133,6 +133,8 @@ namespace IRaCIS.Core.Application.ViewModel
{ {
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
public bool IsReAssign { get; set; }
public List<Guid> SubjectIdList { get; set; } public List<Guid> SubjectIdList { get; set; }
public List<Guid> DoctorUserIdList { get; set; } public List<Guid> DoctorUserIdList { get; set; }

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

@ -83,25 +83,30 @@ namespace IRaCIS.Core.Application.Service
.WhereIf(querySubjectAssign.DoctorUserId != null, t => t.SubjectDoctorList.Any(t => t.DoctorUserId == querySubjectAssign.DoctorUserId)) .WhereIf(querySubjectAssign.DoctorUserId != null, t => t.SubjectDoctorList.Any(t => t.DoctorUserId == querySubjectAssign.DoctorUserId))
.ProjectTo<SubjectAssignView>(_mapper.ConfigurationProvider); .ProjectTo<SubjectAssignView>(_mapper.ConfigurationProvider);
var pageList = await subjectQuery.ToPagedListAsync(querySubjectAssign.PageIndex, querySubjectAssign.PageSize, string.IsNullOrWhiteSpace(querySubjectAssign.SortField) ? nameof(querySubjectAssign.SubjectId) : querySubjectAssign.SortField, querySubjectAssign.Asc ); var pageList = await subjectQuery.ToPagedListAsync(querySubjectAssign.PageIndex, querySubjectAssign.PageSize, string.IsNullOrWhiteSpace(querySubjectAssign.SortField) ? nameof(querySubjectAssign.SubjectId) : querySubjectAssign.SortField, querySubjectAssign.Asc);
return pageList; return pageList;
} }
/// <summary> /// <summary>
/// 批量为 多个Subject 分配医生 手动分配 /// 批量为 多个Subject 分配医生 手动分配 IsReAssign 为true 批量删除 重新分配
/// </summary> /// </summary>
/// <param name="assginSubjectDoctorCommand"></param> /// <param name="assginSubjectDoctorCommand"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public async Task<IResponseOutput> AssignSubjectDoctor(AssginSubjectDoctorCommand assginSubjectDoctorCommand) public async Task<IResponseOutput> AssignSubjectDoctor(AssginSubjectDoctorCommand assginSubjectDoctorCommand)
{ {
if (assginSubjectDoctorCommand.IsReAssign)
{
await _subjectUserRepository.BatchDeleteNoTrackingAsync(t => assginSubjectDoctorCommand.DoctorUserIdList.Contains(t.DoctorUserId) && assginSubjectDoctorCommand.SubjectIdList.Contains(t.SubjectId));
}
foreach (var subjectId in assginSubjectDoctorCommand.SubjectIdList) foreach (var subjectId in assginSubjectDoctorCommand.SubjectIdList)
{ {
foreach (var doctorUserId in assginSubjectDoctorCommand.DoctorUserIdList) foreach (var doctorUserId in assginSubjectDoctorCommand.DoctorUserIdList)
{ {
await _subjectUserRepository.AddAsync(new SubjectUser() {TrialId= assginSubjectDoctorCommand.TrialId, SubjectId = subjectId, DoctorUserId = doctorUserId, AssignTime = DateTime.Now }); await _subjectUserRepository.AddAsync(new SubjectUser() { TrialId = assginSubjectDoctorCommand.TrialId, SubjectId = subjectId, DoctorUserId = doctorUserId, AssignTime = DateTime.Now });
} }
await _subjectRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectId, u => new Subject() { IsAssignDoctorUser = true }); await _subjectRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectId, u => new Subject() { IsAssignDoctorUser = true });
@ -121,7 +126,7 @@ namespace IRaCIS.Core.Application.Service
{ {
foreach (var subjectId in cancelSubjectAssignCommand.SubjectIdList) foreach (var subjectId in cancelSubjectAssignCommand.SubjectIdList)
{ {
await _subjectUserRepository.DeleteFromQueryAsync(t=>t.SubjectId== subjectId); await _subjectUserRepository.DeleteFromQueryAsync(t => t.SubjectId == subjectId);
await _subjectRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectId, u => new Subject() { IsAssignDoctorUser = false }); await _subjectRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectId, u => new Subject() { IsAssignDoctorUser = false });
} }

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

@ -20,7 +20,7 @@ namespace IRaCIS.Core.Application.Service
.ForMember(o => o.TotalTaskCount, t => t.MapFrom(u => u.Trial.VisitTaskList.Count())) .ForMember(o => o.TotalTaskCount, t => t.MapFrom(u => u.Trial.VisitTaskList.Count()))
.ForMember(o => o.SelfTaskCount, t => t.MapFrom(u => u.Trial.VisitTaskList.Count(t => t.DoctorUserId == u.DoctorUserId))) .ForMember(o => o.SelfTaskCount, t => t.MapFrom(u => u.Trial.VisitTaskList.Count(t => t.DoctorUserId == u.DoctorUserId)))
.ForMember(o => o.TotalSubjectCount, t => t.MapFrom(u => u.Trial.SubjectList.Count())) .ForMember(o => o.TotalSubjectCount, t => t.MapFrom(u => u.Trial.SubjectList.Count()))
/* .ForMember(o => o.SelfSubjectCount, t => t.MapFrom(u => u.Trial.su.Where(t => t.DoctorUserId == u.DoctorUserId).Select(t=>t.SubjectId).Distinct().Count())*/; .ForMember(o => o.SelfSubjectCount, t => t.MapFrom(u => u.Trial.SubjectDoctorUserList.Where(t => t.DoctorUserId == u.DoctorUserId).Count()));
CreateMap<TaskAllocationRule, AllocateInfo>() CreateMap<TaskAllocationRule, AllocateInfo>()
.ForMember(o => o.ArmList, t => t.MapFrom(u => u.VisitTaskList.Where(c => c.TrialId == u.TrialId).Select(t => t.ArmEnum).Distinct())) .ForMember(o => o.ArmList, t => t.MapFrom(u => u.VisitTaskList.Where(c => c.TrialId == u.TrialId).Select(t => t.ArmEnum).Distinct()))

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

@ -15,6 +15,7 @@ namespace IRaCIS.Core.Domain.Models
TrialDicList = new List<TrialDictionary>(); TrialDicList = new List<TrialDictionary>();
} }
public List<SubjectUser> SubjectDoctorUserList { get; set; }=new List<SubjectUser>();
public List<VisitTask> VisitTaskList { get; set; }=new List<VisitTask>(){ }; public List<VisitTask> VisitTaskList { get; set; }=new List<VisitTask>(){ };
public List<TrialSiteSurvey> TrialSiteSurveyList { get; set; } = new List<TrialSiteSurvey>(); public List<TrialSiteSurvey> TrialSiteSurveyList { get; set; } = new List<TrialSiteSurvey>();