XCKJ
/
EI-Image-Viewer-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改接口

Test.EIImageViewer
he 2022-04-14 16:00:05 +08:00
parent 485eefe129
commit f2132e1e8d
1 changed files with 109 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,37 +158,33 @@ namespace IRaCIS.Application.Services
{ {
svItem.VisitExecuted = VisitExecutedEnum.Unavailable; svItem.VisitExecuted = VisitExecutedEnum.Unavailable;
} }
datas.Add(new DataInspection() //datas.Add(new DataInspection()
{ //{
SubjectVisitId = svItem.Id, // SubjectVisitId = svItem.Id,
SubjectVisitName = svItem.VisitName, // SubjectVisitName = svItem.VisitName,
BlindName = visitPlan.BlindName, // BlindName = visitPlan.BlindName,
Identification = "Add|Visit|Info|Visit-Image Upload", // Identification = "Add|Visit|Info|Visit-Image Upload",
SiteId = svItem.SiteId, // SiteId = svItem.SiteId,
TrialId = svItem.TrialId, // TrialId = svItem.TrialId,
SubjectId = svItem.SubjectId, // SubjectId = svItem.SubjectId,
IsSign = false, // IsSign = false,
CreateTime = createtime, // CreateTime = createtime,
JsonDetail = JsonConvert.SerializeObject(svItem) // JsonDetail = JsonConvert.SerializeObject(svItem)
}); //});
datas.Add(new DataInspection()
{
SubjectVisitId = svItem.Id,
SubjectVisitName = svItem.VisitName,
BlindName = visitPlan.BlindName,
Identification = "Add|Visit|Info|Visit-Image Upload",
SiteId = svItem.SiteId,
TrialId = svItem.TrialId,
SubjectId = svItem.SubjectId,
IsSign = false,
CreateTime = createtime.AddSeconds(1),
JsonDetail = JsonConvert.SerializeObject(svItem)
});
await _repository.AddAsync(svItem); await _repository.AddAsync(svItem);
} }
} }
datas.Add(new DataInspection()
{
BlindName = visitPlan.BlindName,
Identification = "Add|Visit|Info|Visit-Image Upload",
TrialId = visitPlan.TrialId,
IsSign = false,
CreateTime = createtime.AddSeconds(1),
JsonDetail = JsonConvert.SerializeObject(visitPlan)
});
var visitPlanItem = _mapper.Map<VisitStage>(visitPlan); var visitPlanItem = _mapper.Map<VisitStage>(visitPlan);
@ -331,6 +327,9 @@ namespace IRaCIS.Application.Services
} }
List<DataInspection> datas = new List<DataInspection>(); List<DataInspection> datas = new List<DataInspection>();
var addvisitStages = await _visitStageRepository.Where(x => !x.IsHaveFirstConfirmed&&x.TrialId== trialId).ToListAsync();
//更新项目访视计划状态为已确认 //更新项目访视计划状态为已确认
await _trialRepository.UpdateFromQueryAsync(u => u.Id == trialId, t => new Trial() { VisitPlanConfirmed = true }); await _trialRepository.UpdateFromQueryAsync(u => u.Id == trialId, t => new Trial() { VisitPlanConfirmed = true });
@ -343,7 +342,7 @@ namespace IRaCIS.Application.Services
datas.Add(new DataInspection() datas.Add(new DataInspection()
{ {
IsSign = false, IsSign = false,
SubjectVisitId = x.Id,
CreateTime = createtime, CreateTime = createtime,
SubjectVisitName = x.VisitName, SubjectVisitName = x.VisitName,
VisitStageId=x.Id, VisitStageId=x.Id,
@ -353,7 +352,7 @@ namespace IRaCIS.Application.Services
IsConfirmed = true, IsConfirmed = true,
VisitPlanStatus = true, VisitPlanStatus = true,
}), }),
Identification = "Edit|Visit Plan Template|Data|Tria" Identification = "Confirm|Visit Plan Template|Data|Trial Setting-Visit Plan"
}); });
}); });
@ -510,8 +509,6 @@ namespace IRaCIS.Application.Services
//变更某一访视计划Item 受试者访视相关字段 //变更某一访视计划Item 受试者访视相关字段
await _repository.UpdateFromQueryAsync<SubjectVisit>(t => t.TrialId == trialId && t.VisitStageId == changedItem.Id, k => new SubjectVisit() await _repository.UpdateFromQueryAsync<SubjectVisit>(t => t.TrialId == trialId && t.VisitStageId == changedItem.Id, k => new SubjectVisit()
{ {
@ -524,9 +521,89 @@ namespace IRaCIS.Application.Services
}); });
} }
var subjectsids = _repository.GetQueryable<Subject>().Where(x => x.TrialId == trialId).Select(x => new
{
x.Code,
x.SiteId,
x.Id
});
List<SubjectVisit> subjectVisits = new List<SubjectVisit>();
addvisitStages.ForEach(x =>
{
subjectsids.ForEach(y =>
{
var guid = new Guid();
// 新增受试者
datas.Add(new DataInspection()
{
BlindName = x.BlindName,
IsSign = false,
SiteId = y.SiteId,
SubjectId = y.Id,
SubjectVisitId = guid,
CreateTime = createtime,
SubjectVisitName = x.VisitName,
TrialId = x.TrialId,
Identification = "Add|Visit|Info|Visit-Image Upload",
JsonDetail = JsonConvert.SerializeObject(new
{
IsBaseLine = x.BlindName,
VisitName = x.VisitName,
VisitNum = x.VisitNum,
VisitDay = x.VisitDay,
VisitExecuted=false,
VisitWindowLeft = x.VisitWindowLeft,
VisitWindowRight = x.VisitWindowRight
}),
});
// 初始化受试者
datas.Add(new DataInspection()
{
SiteId = y.SiteId,
SubjectId = y.Id,
SubjectVisitId = guid,
TrialId = x.TrialId,
SubjectCode = y.Code,
BlindName = x.BlindName,
SubjectVisitName = x.VisitName,
IsSign = false,
CreateTime = createtime.AddSeconds(1),
Identification = "Init|Visit|Status|Visit-Image Upload",
JsonDetail = JsonConvert.SerializeObject(new
{
VisitName = x.VisitName,
SubmitState = "",
AuditState = "",
})
});
subjectVisits.Add(new SubjectVisit()
{
SiteId = y.SiteId,
SubjectId = y.Id,
Id = guid,
BlindName=x.BlindName,
IsBaseLine=x.IsBaseLine,
IsCheckBack=x.IsBaseLine,
});
});
});
await _inspectionService.AddListInspectionRecordAsync(datas); await _inspectionService.AddListInspectionRecordAsync(datas);
await _repository.AddAsync(stat); await _repository.AddAsync(stat);
await _repository.AddRangeAsync(subjectVisits);
await _repository.SaveChangesAsync(); await _repository.SaveChangesAsync();
return ResponseOutput.Ok(); return ResponseOutput.Ok();