From a578113b94fffe377840386e042314f174e47d52 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Thu, 5 May 2022 15:08:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Visit/SubjectVisitService.cs | 37 +------ .../Service/Visit/VisitPlanService.cs | 97 +------------------ 2 files changed, 2 insertions(+), 132 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs index f2275e876..552acc8f4 100644 --- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs +++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs @@ -108,48 +108,13 @@ namespace IRaCIS.Core.Application.Services // 更新受试者 subject.FirstGiveMedicineTime = svCommand.SubjectFirstGiveMedicineTime; - List datas = new List(); - - datas.Add(new DataInspection() - { - SubjectId = subject.Id, - SiteId = subject.SiteId, - TrialId = subject.TrialId, - IsSign = false, - Identification = "Edit|Subject|Info|Subject", - CreateTime = DateTime.Now.AddSeconds(1), - JsonDetail = subject.ToJcJson(), - }); - await _inspectionService.AddListInspectionRecordAsync(datas); + } await _repository.SaveChangesAsync(); - - - if (svCommand.Id == null) - { - List dataInspection=new List(); - - dataInspection.Add(new DataInspection() - { - TrialId = svCommand.TrialId, - SiteId = svCommand.SiteId, - SubjectId = svCommand.SubjectId, - SubjectVisitId = svCommand.Id, - SubjectVisitName = svCommand.VisitName, - IsSign = false, - CreateTime = DateTime.Now.AddSeconds(1), - Identification = "Init|Visit|Status|Visit-Image Upload", - JsonDetail = svCommand.ToJcJson() - }); - - await _inspectionService.AddListInspectionRecordAsync(dataInspection); - } - - return ResponseOutput.Ok(dbBeforeEntity.Id.ToString()); diff --git a/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs b/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs index 1b515b22b..d7eae738c 100644 --- a/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs +++ b/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs @@ -348,102 +348,7 @@ namespace IRaCIS.Application.Services var addvisitStages = await _visitStageRepository.Where(x => !x.IsHaveFirstConfirmed && x.TrialId == trialId).ToListAsync(); - addvisitStages.ForEach(x => - { - subjectsids.ForEach(y => - { - - - - Guid dataindtid = NewId.NextGuid(); - Guid guid = NewId.NextGuid(); - - SubjectVisit subjectVisit = new SubjectVisit() - { - SiteId = y.SiteId, - SubjectId = y.Id, - Id = guid, - VisitName = x.VisitName, - - BlindName = x.BlindName, - IsBaseLine = x.IsBaseLine, - IsUrgent = false, - }; - - subjectVisits.Add(subjectVisit); - - // - datas.Add(new DataInspection() - { - Id = dataindtid, - BlindName = x.BlindName, - IsSign = false, - SiteId = y.SiteId, - SubjectId = y.Id, - SubjectVisitId = guid, - CreateTime = createtime.AddMilliseconds(200), - SubjectVisitName = x.VisitName, - TrialId = x.TrialId, - Identification = "Add|Visit|Info|Visit-Image Upload", - JsonDetail = JsonConvert.SerializeObject(new - { - IsBaseLine = x.IsBaseLine, - VisitName = x.VisitName, - VisitNum = x.VisitNum, - VisitDay = x.VisitDay, - VisitExecuted = subjectVisit.VisitExecuted, - BlindName = x.BlindName, - VisitWindowLeft = x.VisitWindowLeft, - VisitWindowRight = x.VisitWindowRight, - IsEnrollment = y.IsEnrollment, - IsUrgent = false, - IsFinalVisit = subjectVisit.IsFinalVisit, - IsLostVisit = subjectVisit.IsLostVisit, - - PDState = false, - }), - }); - - // 初始化受试者 - datas.Add(new DataInspection() - { - SiteId = y.SiteId, - SubjectId = y.Id, - SubjectVisitId = guid, - SubjectCode = y.Code, - BlindName = x.BlindName, - //ParentId = dataindtid, - SubjectVisitName = x.VisitName, - IsSign = false, - TrialId = x.TrialId, - CreateTime = createtime.AddMilliseconds(500), - Identification = "Init|Visit|Status|Visit-Image Upload", - JsonDetail = JsonConvert.SerializeObject(new - { - BlindName = x.BlindName, - VisitName = x.VisitName, - SubmitState = subjectVisit.SubmitState, - AuditState = subjectVisit.AuditState, - IsBaseLine = x.IsBaseLine, - IsEnrollment = y.IsEnrollment, - IsUrgent = y.IsUrgent, - VisitNum = x.VisitNum, - VisitDay = x.VisitDay, - VisitExecuted = subjectVisit.VisitExecuted, - VisitWindowLeft = x.VisitWindowLeft, - VisitWindowRight = x.VisitWindowRight, - IsFinalVisit = subjectVisit.IsFinalVisit, - IsLostVisit = subjectVisit.IsLostVisit, - PDState = false, - }), - }); - - - }); - - - }); - await _inspectionService.AddListInspectionRecordAsync(datas); + //await _subjectVisitRepository.AddRangeAsync() await _repository.AddRangeAsync(subjectVisits);