From 7a744293e5f886129f6566f9f9b901d55b3c514d Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Sat, 7 May 2022 09:09:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/QC/NoneDicomStudyService.cs | 6 +++--- .../Triggers/SubjectVisitTrigger.cs | 14 +------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs index a0056a746..a144b2e7b 100644 --- a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs +++ b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs @@ -126,7 +126,7 @@ namespace IRaCIS.Core.Application.Contracts await _noneDicomStudyRepository.DeleteFromQueryAsync( noneDicomStudyId); - await _noneDicomStudyFileRepository.BatchDeleteNoTrackingAsync(t => t.NoneDicomStudyId == noneDicomStudyId); + await _noneDicomStudyFileRepository.DeleteFromQueryAsync(t => t.NoneDicomStudyId == noneDicomStudyId); //确认需求 不删除 //await _studyMonitorRepository.BatchDeleteNoTrackingAsync(t => t.StudyId == noneDicomStudyId); @@ -143,7 +143,7 @@ namespace IRaCIS.Core.Application.Contracts { //var subjectVisitId = await _noneDicomStudyFileRepository.Where(t => t.Id == noneDicomStudyFileId).Select(t => t.NoneDicomStudy.SubjectVisitId).FirstOrDefaultAsync(); - var success = await _noneDicomStudyFileRepository.BatchDeleteNoTrackingAsync(t => t.Id == noneDicomStudyFileId); + var success = await _noneDicomStudyFileRepository.DeleteFromQueryAsync(t => t.Id == noneDicomStudyFileId,true); return ResponseOutput.Ok(); } @@ -230,7 +230,7 @@ namespace IRaCIS.Core.Application.Contracts } // 上传非Dicom 后 将状态改为待提交 分为普通上传 和QC后重传 普通上传时才改为待提交 - await _repository.BatchUpdateAsync(t => t.Id == subjectVisitId && t.SubmitState == SubmitStateEnum.None, u => new SubjectVisit() { SubmitState = SubmitStateEnum.ToSubmit }); + await _subjectVisitRepository.UpdatePartialFromQueryAsync(t => t.Id == subjectVisitId && t.SubmitState == SubmitStateEnum.None, u => new SubjectVisit() { SubmitState = SubmitStateEnum.ToSubmit }); var studyCode= await _noneDicomStudyRepository.Where(t=>t.Id== noneDicomStudyId).Select(t => t.StudyCode).FirstOrDefaultAsync(); diff --git a/IRaCIS.Core.Application/Triggers/SubjectVisitTrigger.cs b/IRaCIS.Core.Application/Triggers/SubjectVisitTrigger.cs index 89365b0fa..d254a9b47 100644 --- a/IRaCIS.Core.Application/Triggers/SubjectVisitTrigger.cs +++ b/IRaCIS.Core.Application/Triggers/SubjectVisitTrigger.cs @@ -74,23 +74,11 @@ namespace IRaCIS.Core.Application.Triggers var subjectvisit =await _subjectVisitRepository.FirstOrDefaultAsync(x => x.Id == subjectVisitId&&x.SubmitState == SubmitStateEnum.ToSubmit); subjectvisit.SubmitState = SubmitStateEnum.None; - List datas = new List(); - datas.Add(new DataInspection() - { - Identification = "Edit|Visit|Status|Visit-Image Upload|Add Image", - TrialId = subjectvisit.TrialId, - SiteId = subjectvisit.SiteId, - SubjectId = subjectvisit.SubjectId, - SubjectVisitId = subjectvisit.Id, - Reason = "删除影像", - JsonDetail = subjectvisit.ToJcJson(), - }); - //// 这里是触发器的位置 //await _subjectVisitRepository.AddListInspectionRecordAsync(datas); await _subjectVisitRepository.UpdatePartialFromQueryAsync(t => t.Id == subjectVisitId && t.SubmitState == SubmitStateEnum.ToSubmit, - u => new SubjectVisit() { VisitExecuted = 0, SVENDTC = null, SVSTDTC = null, SubmitState = SubmitStateEnum.None }); + u => new SubjectVisit() { VisitExecuted = 0, SVENDTC = null, SVSTDTC = null, SubmitState = SubmitStateEnum.None },true); } }