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

修改接口

Uat_Study
he 2022-04-15 16:57:54 +08:00
parent 81a6070644
commit 4c96bc82d3
4 changed files with 46 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IRaCIS.Core.API/Controllers/InspectionController.cs
View File

@ -468,6 +468,7 @@ namespace IRaCIS.Core.API.Controllers
{
return ResponseOutput.NotOk(fun.ErrorMessage);
}
opt.AuditInfo.VisitStageId = Guid.Parse(fun.Data);
opt.OptCommand.Id = Guid.Parse(fun.Data);
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, null, fun);
}

17
IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
View File

@ -324,7 +324,22 @@ namespace IRaCIS.Core.Application.Service.Inspection
add.ParentId = (await _repository.GetQueryable<DataInspection>().Where(x => x.TrialId == add.TrialId && x.SubjectVisitId == add.SubjectVisitId && x.SubjectId == add.SubjectId && x.SiteId == add.SiteId && x.ChildrenType == add.ChildrenType && x.ObjectType == add.ObjectType&&x.VisitStageId==add.VisitStageId&& x.GeneralId == add.GeneralId).OrderByDescending(x => x.CreateTime).FirstOrDefaultAsync())?.Id;
add.CreateUserId = _userInfo.Id;
add.IP = _userInfo.IP;
var JsonData = JsonConvert.DeserializeObject<IDictionary<string, object>>(add.JsonDetail);
foreach (var item in JsonData.Keys)
{
if (JsonData[item].ToString().ToLower() == "true".ToLower())
{
JsonData[item] = "是";
} else if (JsonData[item].ToString().ToLower() == "false".ToLower())
{
JsonData[item] = "否";
}
}
add.JsonDetail= JsonConvert.SerializeObject(JsonData);
}
await _dataInspectionRepository.AddRangeAsync(datas);

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

@ -110,7 +110,7 @@ namespace IRaCIS.Application.Services
CreateTime = createtime,
Identification = "Init|Subject|Status|Subject",
JsonDetail= JsonConvert.SerializeObject(new {
Status= "OnVisit",
Status= "新增",
})
});

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

@ -176,15 +176,7 @@ namespace IRaCIS.Application.Services
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);
@ -192,6 +184,16 @@ namespace IRaCIS.Application.Services
var result = await _repository.AddAsync(visitPlanItem);
visitPlan.Id = result.Id;
//datas.Add(new DataInspection()
//{
// BlindName = visitPlan.BlindName,
// Identification = "Add|Visit|Info|Visit-Image Upload",
// TrialId = visitPlan.TrialId,
// IsSign = false,
// CreateTime = createtime.AddSeconds(1),
// VisitStageId = result.Id,
// JsonDetail = JsonConvert.SerializeObject(visitPlan)
//});
//更新项目访视计划状态为未确认
await _trialRepository.UpdateFromQueryAsync(u => u.Id == visitPlan.TrialId, t => new Trial() { VisitPlanConfirmed = false });
@ -337,15 +339,17 @@ namespace IRaCIS.Application.Services
var changedList = await _visitStageRepository.Where(t => t.TrialId == trialId && t.IsConfirmed == false)
.Select(t => new { t.Trial.IsHaveFirstGiveMedicineDate, t.Id, t.VisitName, t.TrialId, t.VisitWindowLeft, t.VisitWindowRight, t.VisitDay, t.VisitNum, t.IsBaseLine }).ToListAsync();
var createtime = DateTime.Now.AddSeconds(1);
changedList.ForEach(x =>
{
datas.Add(new DataInspection()
{
IsSign = false,
CreateTime = createtime,
SubjectVisitName = x.VisitName,
VisitStageId=x.Id,
//SubjectVisitName = x.VisitName,
VisitStageId = x.Id,
TrialId = x.TrialId,
JsonDetail = JsonConvert.SerializeObject(new
{
@ -357,7 +361,6 @@ namespace IRaCIS.Application.Services
});
//访视计划 整体状态变更为 确认
await _visitStageRepository.UpdateFromQueryAsync(u => u.TrialId == trialId, t => new VisitStage() { IsConfirmed = true ,IsHaveFirstConfirmed = true});
@ -525,7 +528,9 @@ namespace IRaCIS.Application.Services
{
x.Code,
x.SiteId,
x.Id
x.Id,
x.IsEnrollment,
x.IsUrgent
});
@ -549,7 +554,7 @@ namespace IRaCIS.Application.Services
SiteId = y.SiteId,
SubjectId = y.Id,
SubjectVisitId = guid,
CreateTime = createtime,
CreateTime = createtime.AddMilliseconds(200),
SubjectVisitName = x.VisitName,
TrialId = x.TrialId,
Identification = "Add|Visit|Info|Visit-Image Upload",
@ -561,7 +566,9 @@ namespace IRaCIS.Application.Services
VisitDay = x.VisitDay,
VisitExecuted=false,
VisitWindowLeft = x.VisitWindowLeft,
VisitWindowRight = x.VisitWindowRight
VisitWindowRight = x.VisitWindowRight,
IsEnrollment=y.IsEnrollment,
IsUrgent=y.IsUrgent,
}),
});
@ -576,13 +583,15 @@ namespace IRaCIS.Application.Services
BlindName = x.BlindName,
SubjectVisitName = x.VisitName,
IsSign = false,
CreateTime = createtime.AddSeconds(1),
CreateTime = createtime.AddMilliseconds(500),
Identification = "Init|Visit|Status|Visit-Image Upload",
JsonDetail = JsonConvert.SerializeObject(new
{
VisitName = x.VisitName,
SubmitState = "",
AuditState = "",
IsEnrollment = y.IsEnrollment,
IsUrgent = y.IsUrgent,
})
});
@ -595,6 +604,8 @@ namespace IRaCIS.Application.Services
BlindName=x.BlindName,
IsBaseLine=x.IsBaseLine,
IsCheckBack=x.IsBaseLine,
IsUrgent=y.IsUrgent,
});
});