diff --git a/IRaCIS.Core.API/Controllers/InspectionController.cs b/IRaCIS.Core.API/Controllers/InspectionController.cs index 944716230..8a0e4a46b 100644 --- a/IRaCIS.Core.API/Controllers/InspectionController.cs +++ b/IRaCIS.Core.API/Controllers/InspectionController.cs @@ -91,6 +91,7 @@ namespace IRaCIS.Core.API.Controllers } #endregion + #region 影像质疑 /// @@ -571,7 +572,7 @@ namespace IRaCIS.Core.API.Controllers } opt.AuditInfo.VisitStageId = 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); } diff --git a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs index d95c3d7d1..acd1ccec6 100644 --- a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs @@ -150,7 +150,7 @@ namespace IRaCIS.Core.Application.Service.Inspection .WhereIf(!dto.Description.IsNullOrEmpty(), x => x.Description == dto.Description) .WhereIf(!dto.OpByUserName.IsNullOrEmpty(), x => x.CreateUserName.Contains(dto.OpByUserName)) //.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 diff --git a/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs b/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs index 5c46d95a4..af9f61ea7 100644 --- a/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs +++ b/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs @@ -319,12 +319,16 @@ namespace IRaCIS.Application.Services //找到访视计划修改的Item 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); changedList.ForEach(x => { + datas.Add(new DataInspection() { IsSign = false, @@ -334,7 +338,8 @@ namespace IRaCIS.Application.Services VisitStageId = x.Id, TrialId = x.TrialId, 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 受试者访视相关字段 await _repository.BatchUpdateAsync(t => t.TrialId == trialId && t.VisitStageId == changedItem.Id, k => new SubjectVisit() { @@ -515,18 +515,20 @@ namespace IRaCIS.Application.Services List subjectVisits = new List(); - + var trial =await _repository.GetQueryable().FirstOrDefaultAsync(x => x.Id == trialId); addvisitStages.ForEach(x => { subjectsids.ForEach(y => { - var guid = new Guid(); - // 新增受试者 + var dataindtid = Guid.NewGuid(); + var guid = Guid.NewGuid(); + // datas.Add(new DataInspection() { + Id= dataindtid, BlindName = x.BlindName, IsSign = false, SiteId = y.SiteId, @@ -547,7 +549,10 @@ namespace IRaCIS.Application.Services VisitWindowLeft = x.VisitWindowLeft, VisitWindowRight = x.VisitWindowRight, 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, SubjectId = y.Id, SubjectVisitId = guid, - TrialId = x.TrialId, + SubjectCode = y.Code, BlindName = x.BlindName, - + ParentId = dataindtid, SubjectVisitName = x.VisitName, IsSign = false, CreateTime = createtime.AddMilliseconds(500), @@ -569,25 +574,26 @@ namespace IRaCIS.Application.Services { BlindName = x.BlindName, VisitName = x.VisitName, - SubmitState = "", - AuditState = "", + SubmitState = "未提交", + AuditState = "未审核", IsBaseLine = x.IsBaseLine, IsEnrollment = y.IsEnrollment, IsUrgent = y.IsUrgent, - }) + }), }); subjectVisits.Add(new SubjectVisit() { - + SiteId = y.SiteId, SubjectId = y.Id, Id = guid, VisitName=x.VisitName, + BlindName=x.BlindName, IsBaseLine=x.IsBaseLine, IsCheckBack=x.IsBaseLine, - IsUrgent=y.IsUrgent, + IsUrgent= trial.IsSubjectExpeditedView, });