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

修改访视

Browse Source
This commit is contained in:
hang
2022-06-21 16:18:57 +08:00
parent e9b389ab3e
commit 009fcae3d8
5 changed files with 115 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Visit/SubjectService.cs
-18
View File
@@ -55,24 +55,6 @@ namespace IRaCIS.Application.Services
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
{
IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs
+24 -23
View File
@@ -23,10 +23,10 @@ namespace IRaCIS.Application.Services
private readonly IRepository<Subject> _subjectRepository;
private readonly IRepository<VisitPlanInfluenceStat> _visitPlanInfluenceStatRepository;
public VisitPlanService(IRepository<VisitStage> visitStageRepository, IRepository<Trial> trialRepository, IRepository<SubjectVisit> subjectVisitRepository,
IRepository<VisitPlanInfluenceStudy> visitPlanInfluenceStudy,IRepository<Subject> subjectRepository, IRepository<VisitPlanInfluenceStat> visitPlanInfluenceStatRepository)
IRepository<VisitPlanInfluenceStudy> visitPlanInfluenceStudy, IRepository<Subject> subjectRepository, IRepository<VisitPlanInfluenceStat> visitPlanInfluenceStatRepository)
{
_visitStageRepository = visitStageRepository;
_trialRepository = trialRepository;
@@ -128,7 +128,6 @@ namespace IRaCIS.Application.Services
{
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))
{
@@ -228,17 +227,6 @@ namespace IRaCIS.Application.Services
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 增加访视任务
//首次确认时 IsHaveFirstConfirmed都为false 不需要给Subject 加访视
@@ -250,26 +238,39 @@ namespace IRaCIS.Application.Services
foreach (var visitPlan in addvisitStages)
{
foreach (var subject in subjects)
{
var addSv = _mapper.Map<SubjectVisit>(visitPlan);
addSv.SubjectId = subject.Id;
addSv.TrialId = subject.TrialId;
addSv.SiteId = subject.SiteId;
var subjectSVS = await _subjectVisitRepository.Where(t => t.TrialId == visitPlan.TrialId).Select(t => new { t.SubjectId, t.SiteId, t.IsFinalVisit }).Distinct().ToListAsync();
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);
}
#endregion