修改一版
parent
f47978bca2
commit
6f97e6051b
|
@ -965,6 +965,11 @@
|
||||||
创建时间
|
创建时间
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetView.EffectOfTime">
|
||||||
|
<summary>
|
||||||
|
生效时间
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetView.CreateUserId">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetView.CreateUserId">
|
||||||
<summary>
|
<summary>
|
||||||
创建人
|
创建人
|
||||||
|
|
|
@ -260,6 +260,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int PlanCount { get; set; }
|
public int PlanCount { get; set; }
|
||||||
|
|
||||||
|
public bool IsGlobal { get; set; }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class SetReadingPeriodSetEffect
|
public class SetReadingPeriodSetEffect
|
||||||
|
|
|
@ -19,18 +19,21 @@ namespace IRaCIS.Core.Application.Services
|
||||||
{
|
{
|
||||||
private readonly IRepository<SubjectVisit> _subjectVisitRepository;
|
private readonly IRepository<SubjectVisit> _subjectVisitRepository;
|
||||||
private readonly IRepository<ReadModule> _readModuleRepository;
|
private readonly IRepository<ReadModule> _readModuleRepository;
|
||||||
|
private readonly IRepository<Trial> _trialRepository;
|
||||||
private readonly IRepository<ReadingPeriodSet> _readingPeriodSetRepository;
|
private readonly IRepository<ReadingPeriodSet> _readingPeriodSetRepository;
|
||||||
private readonly IRepository<ReadingPeriodPlan> _readingPeriodPlanRepository;
|
private readonly IRepository<ReadingPeriodPlan> _readingPeriodPlanRepository;
|
||||||
private readonly IRepository<Subject> _subjectRepository;
|
private readonly IRepository<Subject> _subjectRepository;
|
||||||
|
|
||||||
public SubjectVisitService(IRepository<SubjectVisit> subjectVisitRepository,
|
public SubjectVisitService(IRepository<SubjectVisit> subjectVisitRepository,
|
||||||
IRepository<ReadModule> readModuleRepository,
|
IRepository<ReadModule> readModuleRepository,
|
||||||
|
IRepository<Trial> trialRepository,
|
||||||
IRepository<ReadingPeriodSet> readingPeriodSetRepository,
|
IRepository<ReadingPeriodSet> readingPeriodSetRepository,
|
||||||
IRepository<ReadingPeriodPlan> readingPeriodPlanRepository,
|
IRepository<ReadingPeriodPlan> readingPeriodPlanRepository,
|
||||||
IRepository<Subject> subjectRepository)
|
IRepository<Subject> subjectRepository)
|
||||||
{
|
{
|
||||||
_subjectVisitRepository = subjectVisitRepository;
|
_subjectVisitRepository = subjectVisitRepository;
|
||||||
this._readModuleRepository = readModuleRepository;
|
this._readModuleRepository = readModuleRepository;
|
||||||
|
this._trialRepository = trialRepository;
|
||||||
this._readingPeriodSetRepository = readingPeriodSetRepository;
|
this._readingPeriodSetRepository = readingPeriodSetRepository;
|
||||||
this._readingPeriodPlanRepository = readingPeriodPlanRepository;
|
this._readingPeriodPlanRepository = readingPeriodPlanRepository;
|
||||||
_subjectRepository = subjectRepository;
|
_subjectRepository = subjectRepository;
|
||||||
|
@ -107,6 +110,10 @@ namespace IRaCIS.Core.Application.Services
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 是否全局阅片
|
||||||
|
var isGlobalReading = await _trialRepository.Where(x => x.Id == dbBeforeEntity.TrialId).Select(x => x.IsGlobalReading).FirstOrDefaultAsync();
|
||||||
|
if (isGlobalReading)
|
||||||
|
{
|
||||||
// 末次访视添加全局阅片
|
// 末次访视添加全局阅片
|
||||||
if (dbBeforeEntity.IsFinalVisit == false && svCommand.IsFinalVisit == true)
|
if (dbBeforeEntity.IsFinalVisit == false && svCommand.IsFinalVisit == true)
|
||||||
{
|
{
|
||||||
|
@ -123,6 +130,8 @@ namespace IRaCIS.Core.Application.Services
|
||||||
IsTakeEffect = ReadingPeriodStatus.TakeEffect,
|
IsTakeEffect = ReadingPeriodStatus.TakeEffect,
|
||||||
ReadingPeriodName = "Global",
|
ReadingPeriodName = "Global",
|
||||||
TrialId = dbBeforeEntity.TrialId,
|
TrialId = dbBeforeEntity.TrialId,
|
||||||
|
EffectOfTime = DateTime.Now,
|
||||||
|
IsGlobal = true,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -141,6 +150,7 @@ namespace IRaCIS.Core.Application.Services
|
||||||
{
|
{
|
||||||
await _readModuleRepository.AddAsync(new ReadModule()
|
await _readModuleRepository.AddAsync(new ReadModule()
|
||||||
{
|
{
|
||||||
|
ReadingPeriodSetId = readingPeriodSet.Id,
|
||||||
IsUrgent = dbBeforeEntity.IsUrgent,
|
IsUrgent = dbBeforeEntity.IsUrgent,
|
||||||
SubjectVisitId = svCommand.Id.Value,
|
SubjectVisitId = svCommand.Id.Value,
|
||||||
Status = ReadModuleEnum.TaskAllocation,
|
Status = ReadModuleEnum.TaskAllocation,
|
||||||
|
@ -152,6 +162,7 @@ namespace IRaCIS.Core.Application.Services
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
//更新受试者 访视基准日期 是否入组确认
|
//更新受试者 访视基准日期 是否入组确认
|
||||||
|
|
|
@ -72,6 +72,11 @@ namespace IRaCIS.Core.Domain.Models
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public Guid CreateUserId { get; set; }
|
public Guid CreateUserId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 是否为全局阅片
|
||||||
|
/// </summary>
|
||||||
|
public bool IsGlobal { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 阅片配置的类型
|
/// 阅片配置的类型
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
Loading…
Reference in New Issue