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

修改一版

Uat_Study
he 2022-10-25 17:10:07 +08:00
parent ad231fdb53
commit 56ee781b2e
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
View File

@ -31,6 +31,7 @@ namespace IRaCIS.Core.Application.Service
private readonly IRepository<ReadingJudgeInfo> _readingJudgeInfoRepository; private readonly IRepository<ReadingJudgeInfo> _readingJudgeInfoRepository;
private readonly IRepository<TaskAllocationRule> _taskAllocationRuleRepository; private readonly IRepository<TaskAllocationRule> _taskAllocationRuleRepository;
private readonly IRepository<SubjectUser> _subjectUserRepository; private readonly IRepository<SubjectUser> _subjectUserRepository;
private readonly IRepository<ReadModule> _readModuleRepository;
private readonly IMapper _mapper; private readonly IMapper _mapper;
private readonly IUserInfo _userInfo; private readonly IUserInfo _userInfo;
@ -41,11 +42,13 @@ namespace IRaCIS.Core.Application.Service
public VisitTaskHelpeService(IRepository<VisitTask> visitTaskRepository, IRepository<SubjectUser> subjectUserRepository, IRepository<Trial> trialRepository, IEasyCachingProvider provider, public VisitTaskHelpeService(IRepository<VisitTask> visitTaskRepository, IRepository<SubjectUser> subjectUserRepository, IRepository<Trial> trialRepository, IEasyCachingProvider provider,
IRepository<SubjectVisit> subjectVisitRepository, IRepository<SubjectVisit> subjectVisitRepository,
IRepository<ReadModule> readModuleRepository,
IRepository<ReadingJudgeInfo> readingJudgeInfoRepository, IRepository<ReadingJudgeInfo> readingJudgeInfoRepository,
IRepository<TaskAllocationRule> taskAllocationRuleRepository, IMapper mapper, IUserInfo userInfo, IRepository<VisitTaskReReading> visitTaskReReadingRepository, IRepository<ReadingQuestionCriterionTrial> trialReadingCriterionRepository) IRepository<TaskAllocationRule> taskAllocationRuleRepository, IMapper mapper, IUserInfo userInfo, IRepository<VisitTaskReReading> visitTaskReReadingRepository, IRepository<ReadingQuestionCriterionTrial> trialReadingCriterionRepository)
{ {
_visitTaskRepository = visitTaskRepository; _visitTaskRepository = visitTaskRepository;
_trialRepository = trialRepository; _trialRepository = trialRepository;
this._readModuleRepository = readModuleRepository;
_provider = provider; _provider = provider;
_subjectVisitRepository = subjectVisitRepository; _subjectVisitRepository = subjectVisitRepository;
this._readingJudgeInfoRepository = readingJudgeInfoRepository; this._readingJudgeInfoRepository = readingJudgeInfoRepository;
@ -813,9 +816,11 @@ namespace IRaCIS.Core.Application.Service
var originalTaskInfo = await _visitTaskRepository.Where(x => x.Id == generateTaskCommand.OriginalVisitId).FirstNotNullAsync(); var originalTaskInfo = await _visitTaskRepository.Where(x => x.Id == generateTaskCommand.OriginalVisitId).FirstNotNullAsync();
foreach (var item in generateTaskCommand.ReadingGenerataTaskList) foreach (var item in generateTaskCommand.ReadingGenerataTaskList)
{ {
item.VisitNum = await _readModuleRepository.Where(x => x.Id == item.ReadModuleId).Select(x => x.SubjectVisit.VisitNum).FirstOrDefaultAsync();
var task1 = await _visitTaskRepository.AddAsync(new VisitTask() var task1 = await _visitTaskRepository.AddAsync(new VisitTask()
{ {
TrialId = trialId, TrialId = trialId,
@ -847,12 +852,17 @@ namespace IRaCIS.Core.Application.Service
originalTaskInfo = await _visitTaskRepository.Where(x => x.Id == generateTaskCommand.OriginalVisitId).FirstNotNullAsync(); originalTaskInfo = await _visitTaskRepository.Where(x => x.Id == generateTaskCommand.OriginalVisitId).FirstNotNullAsync();
foreach (var item in generateTaskCommand.ReadingGenerataTaskList) foreach (var item in generateTaskCommand.ReadingGenerataTaskList)
{ {
//需要 根据标准筛选 //需要 根据标准筛选
var oncologySubjectUser = await _subjectUserRepository.Where(x => x.SubjectId == item.SubjectId && x.ArmEnum == Arm.TumorArm && x.IsConfirmed).FirstOrDefaultAsync(); var oncologySubjectUser = await _subjectUserRepository.Where(x => x.SubjectId == item.SubjectId && x.ArmEnum == Arm.TumorArm && x.IsConfirmed&&x.TrialReadingCriterionId== originalTaskInfo.TrialReadingCriterionId).FirstOrDefaultAsync();
var singleTask = await _visitTaskRepository.AddAsync(new VisitTask() item.VisitNum = await _readModuleRepository.Where(x => x.Id == item.ReadModuleId).Select(x => x.SubjectVisit.VisitNum).FirstOrDefaultAsync();
var singleTask = await _visitTaskRepository.AddAsync(new VisitTask()
{ {
TrialId = trialId, TrialId = trialId,
SubjectId = item.SubjectId, SubjectId = item.SubjectId,

2
IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs
View File

@ -303,7 +303,7 @@ namespace IRaCIS.Application.Services
{ {
IsUrgent = readModuleData.IsUrgent ?? false, IsUrgent = readModuleData.IsUrgent ?? false,
SubjectId = readModuleData.SubjectId, SubjectId = readModuleData.SubjectId,
VisitNum=await _subjectVisitRepository.Where(x=>x.Id==readModuleData.SubjectVisitId).Select(x=>x.VisitNum).FirstOrDefaultAsync() ,
ReadingName = readModuleData.ModuleName, ReadingName = readModuleData.ModuleName,
ReadModuleId =readModuleData.Id, ReadModuleId =readModuleData.Id,
ReadingCategory = ReadingCategory.Global, ReadingCategory = ReadingCategory.Global,

3
IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs
View File

@ -206,7 +206,6 @@ namespace IRaCIS.Application.Services
{ {
IsUrgent = readModule.IsUrgent??false, IsUrgent = readModule.IsUrgent??false,
SubjectId = readModule.SubjectId, SubjectId = readModule.SubjectId,
VisitNum= await _subjectVisitRepository.Where(x=>x.Id==readModule.SubjectVisitId).Select(x=>x.VisitNum).FirstOrDefaultAsync(),
ReadingName = readModule.ModuleName, ReadingName = readModule.ModuleName,
ReadModuleId =readModule.Id, ReadModuleId =readModule.Id,
ReadingCategory = ReadingCategory.Global, ReadingCategory = ReadingCategory.Global,
@ -264,7 +263,7 @@ namespace IRaCIS.Application.Services
{ {
IsUrgent = readModule.IsUrgent ?? false, IsUrgent = readModule.IsUrgent ?? false,
SubjectId = readModule.SubjectId, SubjectId = readModule.SubjectId,
VisitNum=await _visitTaskRepository.Where(x=>x.Id==readModule.SubjectVisitId).Select(x=>x.VisitTaskNum).FirstOrDefaultAsync(),
ReadingName = readModule.ModuleName, ReadingName = readModule.ModuleName,
ReadModuleId =readModule.Id, ReadModuleId =readModule.Id,
ReadingCategory = ReadingCategory.Oncology, ReadingCategory = ReadingCategory.Oncology,