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

修改修改一版

Uat_Study
he 2022-04-20 20:20:50 +08:00
parent bf9055c80f
commit 04ba060c84
3 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,6 +91,7 @@ namespace IRaCIS.Core.API.Controllers
} }
#endregion #endregion
#region 影像质疑 #region 影像质疑
/// <summary> /// <summary>
@ -571,7 +572,7 @@ namespace IRaCIS.Core.API.Controllers
} }
opt.AuditInfo.VisitStageId = fun.Data.Id; opt.AuditInfo.VisitStageId = fun.Data.Id;
opt.OptCommand.Id = fun.Data.Id; opt.OptCommand.Id = fun.Data.Id;
opt.AuditInfo.BlindName = fun.Data.BlindName;
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, null, fun); return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, null, fun);
} }

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

@ -150,7 +150,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
.WhereIf(!dto.Description.IsNullOrEmpty(), x => x.Description == dto.Description) .WhereIf(!dto.Description.IsNullOrEmpty(), x => x.Description == dto.Description)
.WhereIf(!dto.OpByUserName.IsNullOrEmpty(), x => x.CreateUserName.Contains(dto.OpByUserName)) .WhereIf(!dto.OpByUserName.IsNullOrEmpty(), x => x.CreateUserName.Contains(dto.OpByUserName))
//.WhereIf(!dto.SubjectInfo.IsNullOrEmpty(), x => x.SubjectCode.Contains(dto.SubjectInfo)) //.WhereIf(!dto.SubjectInfo.IsNullOrEmpty(), x => x.SubjectCode.Contains(dto.SubjectInfo))
.WhereIf(dto.IsSign != null, x => x.IsSign == dto.IsSign); .WhereIf(dto.IsSign != null, x => x.IsSign == dto.IsSign);
#endregion #endregion

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

@ -319,12 +319,16 @@ namespace IRaCIS.Application.Services
//找到访视计划修改的Item //找到访视计划修改的Item
var changedList = await _visitStageRepository.Where(t => t.TrialId == trialId && t.IsConfirmed == false) 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(); .Select(t => new { t.Trial.IsHaveFirstGiveMedicineDate, t.Id, t.VisitName, t.TrialId, t.VisitWindowLeft, t.VisitWindowRight,
t.VisitDay, t.VisitNum, t.IsBaseLine, t.BlindName,t.Description,
IsConfirmed=true,
}).ToListAsync();
var createtime = DateTime.Now.AddSeconds(1); var createtime = DateTime.Now.AddSeconds(1);
changedList.ForEach(x => changedList.ForEach(x =>
{ {
datas.Add(new DataInspection() datas.Add(new DataInspection()
{ {
IsSign = false, IsSign = false,
@ -334,7 +338,8 @@ namespace IRaCIS.Application.Services
VisitStageId = x.Id, VisitStageId = x.Id,
TrialId = x.TrialId, TrialId = x.TrialId,
JsonDetail = JsonConvert.SerializeObject(x), JsonDetail = JsonConvert.SerializeObject(x),
Identification = "Confirm|Visit Plan Template|Data|Trial Setting-Visit Plan" Identification = "Confirm|Visit Plan Template|Data|Trial Setting-Visit Plan",
}); });
}); });
@ -485,11 +490,6 @@ namespace IRaCIS.Application.Services
}); });
}); });
//变更某一访视计划Item 受试者访视相关字段 //变更某一访视计划Item 受试者访视相关字段
await _repository.BatchUpdateAsync<SubjectVisit>(t => t.TrialId == trialId && t.VisitStageId == changedItem.Id, k => new SubjectVisit() await _repository.BatchUpdateAsync<SubjectVisit>(t => t.TrialId == trialId && t.VisitStageId == changedItem.Id, k => new SubjectVisit()
{ {
@ -515,18 +515,20 @@ namespace IRaCIS.Application.Services
List<SubjectVisit> subjectVisits = new List<SubjectVisit>(); List<SubjectVisit> subjectVisits = new List<SubjectVisit>();
var trial =await _repository.GetQueryable<Trial>().FirstOrDefaultAsync(x => x.Id == trialId);
addvisitStages.ForEach(x => addvisitStages.ForEach(x =>
{ {
subjectsids.ForEach(y => subjectsids.ForEach(y =>
{ {
var guid = new Guid(); var dataindtid = Guid.NewGuid();
// 新增受试者 var guid = Guid.NewGuid();
//
datas.Add(new DataInspection() datas.Add(new DataInspection()
{ {
Id= dataindtid,
BlindName = x.BlindName, BlindName = x.BlindName,
IsSign = false, IsSign = false,
SiteId = y.SiteId, SiteId = y.SiteId,
@ -547,7 +549,10 @@ namespace IRaCIS.Application.Services
VisitWindowLeft = x.VisitWindowLeft, VisitWindowLeft = x.VisitWindowLeft,
VisitWindowRight = x.VisitWindowRight, VisitWindowRight = x.VisitWindowRight,
IsEnrollment=y.IsEnrollment, IsEnrollment=y.IsEnrollment,
IsUrgent=y.IsUrgent, IsUrgent = trial.IsSubjectExpeditedView,
IsFinalVisit=false,
IsLostVisit= false,
PDState = trial.IsPDProgressView,
}), }),
}); });
@ -557,10 +562,10 @@ namespace IRaCIS.Application.Services
SiteId = y.SiteId, SiteId = y.SiteId,
SubjectId = y.Id, SubjectId = y.Id,
SubjectVisitId = guid, SubjectVisitId = guid,
TrialId = x.TrialId,
SubjectCode = y.Code, SubjectCode = y.Code,
BlindName = x.BlindName, BlindName = x.BlindName,
ParentId = dataindtid,
SubjectVisitName = x.VisitName, SubjectVisitName = x.VisitName,
IsSign = false, IsSign = false,
CreateTime = createtime.AddMilliseconds(500), CreateTime = createtime.AddMilliseconds(500),
@ -569,25 +574,26 @@ namespace IRaCIS.Application.Services
{ {
BlindName = x.BlindName, BlindName = x.BlindName,
VisitName = x.VisitName, VisitName = x.VisitName,
SubmitState = "", SubmitState = "未提交",
AuditState = "", AuditState = "未审核",
IsBaseLine = x.IsBaseLine, IsBaseLine = x.IsBaseLine,
IsEnrollment = y.IsEnrollment, IsEnrollment = y.IsEnrollment,
IsUrgent = y.IsUrgent, IsUrgent = y.IsUrgent,
}) }),
}); });
subjectVisits.Add(new SubjectVisit() subjectVisits.Add(new SubjectVisit()
{ {
SiteId = y.SiteId, SiteId = y.SiteId,
SubjectId = y.Id, SubjectId = y.Id,
Id = guid, Id = guid,
VisitName=x.VisitName, VisitName=x.VisitName,
BlindName=x.BlindName, BlindName=x.BlindName,
IsBaseLine=x.IsBaseLine, IsBaseLine=x.IsBaseLine,
IsCheckBack=x.IsBaseLine, IsCheckBack=x.IsBaseLine,
IsUrgent=y.IsUrgent, IsUrgent= trial.IsSubjectExpeditedView,
}); });