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

修改访视

Uat_Study
hang 2022-06-21 16:18:57 +08:00
parent e9b389ab3e
commit 009fcae3d8
5 changed files with 115 additions and 100 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

@ -3366,7 +3366,7 @@
<param name="trialConfig"></param> <param name="trialConfig"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="T:IRaCIS.Core.Application.Triggers.AddVisitPlanTrigger"> <member name="T:IRaCIS.Core.Application.Triggers.AddSubjectTrigger">
<summary> <summary>
添加访视计划 要给改项目下的所有Subject 添加该访视 添加访视计划 要给改项目下的所有Subject 添加该访视
</summary> </summary>

18
IRaCIS.Core.Application/Service/Visit/SubjectService.cs
View File

@ -55,24 +55,6 @@ namespace IRaCIS.Application.Services
mapedSubject= await _subjectRepository.InsertFromDTOAsync(subjectCommand, false, verifyExp1); mapedSubject= await _subjectRepository.InsertFromDTOAsync(subjectCommand, false, verifyExp1);
//添加受试者的时候，获取访视计划列表，添加到受试者访视表。
var visitPlan = await _repository.Where<VisitStage>(t => t.TrialId == subjectCommand.TrialId&&t.IsConfirmed).ToListAsync();
svlist = _mapper.Map<List<SubjectVisit>>(visitPlan);
var IsEnrollementQualificationConfirm = await _repository.Where<Trial>(t => t.Id == mapedSubject.TrialId).Select(u => u.IsEnrollementQualificationConfirm).FirstOrDefaultAsync();
svlist.ForEach(t =>
{
t.Subject = mapedSubject;
t.SubjectId = mapedSubject.Id;
t.TrialId = subjectCommand.TrialId;
t.SiteId = subjectCommand.SiteId;
t.IsEnrollmentConfirm = t.IsBaseLine ? IsEnrollementQualificationConfirm : false;
});
await _subjectVisitRepository.AddRangeAsync(svlist);
} }
else //update else //update
{ {

41
IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs
View File

@ -128,7 +128,6 @@ namespace IRaCIS.Application.Services
{ {
var trial = (await _trialRepository.FirstOrDefaultAsync(t => t.Id == visitPlan.TrialId)).IfNullThrowException(); var trial = (await _trialRepository.FirstOrDefaultAsync(t => t.Id == visitPlan.TrialId)).IfNullThrowException();
trial.VisitPlanConfirmed = false;
if (await _visitStageRepository.AnyAsync(t => t.TrialId == visitPlan.TrialId && (t.VisitName == visitPlan.VisitName || t.VisitNum == visitPlan.VisitNum), true)) if (await _visitStageRepository.AnyAsync(t => t.TrialId == visitPlan.TrialId && (t.VisitName == visitPlan.VisitName || t.VisitNum == visitPlan.VisitNum), true))
{ {
@ -228,17 +227,6 @@ namespace IRaCIS.Application.Services
trial.VisitPlanConfirmed = true; trial.VisitPlanConfirmed = true;
var subjects = _subjectRepository.Where(x => x.TrialId == trialId).Select(x => new
{
x.Code,
x.SiteId,
x.Id,
x.IsEnrollment,
x.IsUrgent,
x.TrialId
});
#region 统一给Subject 增加访视任务 #region 统一给Subject 增加访视任务
//首次确认时 IsHaveFirstConfirmed都为false 不需要给Subject 加访视 //首次确认时 IsHaveFirstConfirmed都为false 不需要给Subject 加访视
@ -250,20 +238,33 @@ namespace IRaCIS.Application.Services
foreach (var visitPlan in addvisitStages) foreach (var visitPlan in addvisitStages)
{ {
foreach (var subject in subjects)
{
var addSv = _mapper.Map<SubjectVisit>(visitPlan);
addSv.SubjectId = subject.Id; var subjectSVS = await _subjectVisitRepository.Where(t => t.TrialId == visitPlan.TrialId).Select(t => new { t.SubjectId, t.SiteId, t.IsFinalVisit }).Distinct().ToListAsync();
addSv.TrialId = subject.TrialId;
addSv.SiteId = subject.SiteId; var subjectList = subjectSVS.Select(t => new { t.SubjectId, t.SiteId }).Distinct().ToList();
foreach (var subject in subjectList)
{
var svItem = _mapper.Map<SubjectVisit>(visitPlan);
svItem.SiteId = subject.SiteId;
svItem.SubjectId = subject.SubjectId;
//设置了末次访视，那么加访视计划的时候，设置为不可用
if (subjectSVS.Any(t => t.SubjectId == svItem.SubjectId && t.IsFinalVisit))
{
svItem.VisitExecuted = VisitExecutedEnum.Unavailable;
}
//再加一层保险，防止重复 //再加一层保险，防止重复
if (!await _subjectVisitRepository.AnyAsync(t => t.VisitStageId == visitPlan.Id && t.SubjectId == subject.Id)) if (!await _subjectVisitRepository.AnyAsync(t => t.VisitStageId == visitPlan.Id && t.SubjectId == subject.SubjectId))
{ {
subjectVisits.Add(addSv); await _subjectVisitRepository.AddAsync(svItem);
} }
} }
} }
await _subjectVisitRepository.AddRangeAsync(subjectVisits); await _subjectVisitRepository.AddRangeAsync(subjectVisits);

90
IRaCIS.Core.Application/Triggers/AddSubjectTrigger.cs Normal file
View File

@ -0,0 +1,90 @@
using AutoMapper;
using EntityFrameworkCore.Triggered;
using IRaCIS.Core.Domain.Share;
using MassTransit;
namespace IRaCIS.Core.Application.Triggers
{
/// <summary>
/// 添加访视计划 要给改项目下的所有Subject 添加该访视
/// </summary>
public class AddSubjectTrigger : IBeforeSaveTrigger<Subject>
{
private readonly IRepository<SubjectVisit> _subjectVisitRepository;
private readonly IRepository<VisitStage> _visitStageRepository;
private readonly IRepository<Trial> _trialRepository;
private readonly IMapper _mapper;
public AddSubjectTrigger(IRepository<SubjectVisit> subjectVisitRepository, IMapper mapper, IRepository<VisitStage> visitStageRepository, IRepository<Trial> trialRepository)
{
_subjectVisitRepository = subjectVisitRepository;
_trialRepository = trialRepository;
_visitStageRepository = visitStageRepository;
_mapper = mapper;
}
public async Task BeforeSave(ITriggerContext<Subject> context, CancellationToken cancellationToken)
{
var subject = context.Entity;
if (context.ChangeType == ChangeType.Added)
{
//添加受试者的时候，获取访视计划列表，添加到受试者访视表。
var visitPlanList = await _visitStageRepository.Where(t => t.TrialId == subject.TrialId && t.IsConfirmed).ToListAsync();
var svList = _mapper.Map<List<SubjectVisit>>(visitPlanList);
var IsEnrollementQualificationConfirm = await _trialRepository.Where(t => t.Id == subject.TrialId).Select(u => u.IsEnrollementQualificationConfirm).FirstOrDefaultAsync();
svList.ForEach(t =>
{
t.Subject = subject;
t.SubjectId = subject.Id;
t.TrialId = subject.TrialId;
t.SiteId = subject.SiteId;
t.IsEnrollmentConfirm = t.IsBaseLine ? IsEnrollementQualificationConfirm : false;
});
await _subjectVisitRepository.AddRangeAsync(svList);
#region 在f访视计划确认的时候处理 给subject添加访视计划
////已添加受试者 都不存在该新增的计划名称 那么该项目所有受试者都增加一个访视记录
//if (!await _subjectVisitRepository.AnyAsync(t => t.VisitName == visitPlan.VisitName && t.TrialId == visitPlan.TrialId))
//{
// var subjectSVS = await _subjectVisitRepository.Where(t => t.TrialId == visitPlan.TrialId).Select(t => new { t.SubjectId, t.SiteId, t.IsFinalVisit }).Distinct().ToListAsync();
// var subjects = subjectSVS.Select(t => new { t.SubjectId, t.SiteId }).Distinct().ToList();
// foreach (var subject in subjects)
// {
// var svItem = _mapper.Map<SubjectVisit>(visitPlan);
// svItem.SiteId = subject.SiteId;
// svItem.SubjectId = subject.SubjectId;
// svItem.Id = NewId.NextGuid();
// //设置了末次访视，那么加访视计划的时候，设置为不可用
// if (subjectSVS.Any(t => t.SubjectId == svItem.SubjectId && t.IsFinalVisit))
// {
// svItem.VisitExecuted = VisitExecutedEnum.Unavailable;
// }
// await _subjectVisitRepository.AddAsync(svItem);
// }
// await _subjectVisitRepository.SaveChangesAsync();
//}
#endregion
}
}
}
}

58
IRaCIS.Core.Application/Triggers/AddVisitPlanTrigger.cs
View File

@ -1,58 +0,0 @@
using AutoMapper;
using EntityFrameworkCore.Triggered;
using IRaCIS.Core.Domain.Share;
using MassTransit;
namespace IRaCIS.Core.Application.Triggers
{
/// <summary>
/// 添加访视计划 要给改项目下的所有Subject 添加该访视
/// </summary>
public class AddVisitPlanTrigger : IAfterSaveTrigger<VisitStage>
{
private readonly IRepository<SubjectVisit> _subjectVisitRepository;
private readonly IMapper _mapper;
public AddVisitPlanTrigger(IRepository<SubjectVisit> subjectVisitRepository,IMapper mapper)
{
_subjectVisitRepository = subjectVisitRepository;
_mapper = mapper;
}
public async Task AfterSave(ITriggerContext<VisitStage> context, CancellationToken cancellationToken)
{
var visitPlan = context.Entity;
if (context.ChangeType == ChangeType.Added)
{
//已添加受试者 都不存在该新增的计划名称 那么该项目所有受试者都增加一个访视记录
if (!await _subjectVisitRepository.AnyAsync(t => t.VisitName == visitPlan.VisitName && t.TrialId == visitPlan.TrialId))
{
var subjectSVS = await _subjectVisitRepository.Where(t => t.TrialId == visitPlan.TrialId).Select(t => new { t.SubjectId, t.SiteId, t.IsFinalVisit }).Distinct().ToListAsync();
var subjects = subjectSVS.Select(t => new { t.SubjectId, t.SiteId }).Distinct().ToList();
foreach (var subject in subjects)
{
var svItem = _mapper.Map<SubjectVisit>(visitPlan);
svItem.SiteId = subject.SiteId;
svItem.SubjectId = subject.SubjectId;
svItem.Id = NewId.NextGuid();
//设置了末次访视，那么加访视计划的时候，设置为不可用
if (subjectSVS.Any(t => t.SubjectId == svItem.SubjectId && t.IsFinalVisit))
{
svItem.VisitExecuted = VisitExecutedEnum.Unavailable;
}
await _subjectVisitRepository.AddAsync(svItem);
}
await _subjectVisitRepository.SaveChangesAsync();
}
}
}
}
}