修复bug

2022-04-12 10:19:33 +08:00
parent eefe406b99
commit 046c13ecf4
2 changed files with 13 additions and 1 deletions
@@ -83,6 +83,12 @@ namespace IRaCIS.Core.Application.Contracts
        [HttpDelete("{noneDicomStudyId:guid}/{trialId:guid}")]
        public async Task<IResponseOutput> DeleteNoneDicomStudy(Guid noneDicomStudyId)
        {
+            if (_noneDicomStudyRepository.Where(t => t.Id == noneDicomStudyId)
+                .Any(t => t.NoneDicomFileList.Count() > 0))
+            {
+                return ResponseOutput.NotOk("先移除文件，才允许删除非Dicom");
+            }
+
            var noneDicomStudy = await _noneDicomStudyRepository.FirstOrDefaultAsync(t => t.Id == noneDicomStudyId);

            if (noneDicomStudy == null) return Null404NotFound(noneDicomStudy);
@@ -107,6 +113,12 @@ namespace IRaCIS.Core.Application.Contracts

                LatestScanDate = maxArray.Max()
            });
+
+            //如果既没有 dicom数据  也没有非dicom 文件  那么提交状态变更回去
+            if (await _repository.CountAsync<DicomStudy>(t => t.SubjectVisitId == noneDicomStudy.SubjectVisitId) == 0 && await _repository.CountAsync<NoneDicomStudyFile>(t => t.NoneDicomStudy.SubjectVisitId == noneDicomStudy.SubjectVisitId) == 0)
+            {
+                await _repository.UpdateFromQueryAsync<SubjectVisit>(t => t.Id == noneDicomStudy.SubjectVisitId && t.SubmitState == SubmitStateEnum.ToSubmit, u => new SubjectVisit() { VisitExecuted = 0, SubmitState = SubmitStateEnum.None });
+            }
            return ResponseOutput.Ok();
        }