From 74a0553cd868d6d68473099800d105017fa27915 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Wed, 20 Apr 2022 15:05:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/QC/DTO/NoneDicomStudyViewModel.cs | 2 ++ .../Service/QC/NoneDicomStudyService.cs | 11 +++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs index df83cb0a4..3afe667e2 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs @@ -60,6 +60,8 @@ namespace IRaCIS.Core.Application.Contracts public string Modality { get; set; } = string.Empty; public DateTime ImageDate { get; set; } public string Description { get; set; } = string.Empty; + + public int? Code { get; set; } } diff --git a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs index 332e7026d..4fee2dec2 100644 --- a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs +++ b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs @@ -64,13 +64,16 @@ namespace IRaCIS.Core.Application.Contracts { using (await _mutex.LockAsync()) { + if (addOrEditNoneDicomStudy.Id == Guid.Empty|| addOrEditNoneDicomStudy.Id==null) + { + addOrEditNoneDicomStudy.Code =(await _noneDicomStudyRepository.Where(t => t.TrialId == addOrEditNoneDicomStudy.TrialId).MaxAsync(x=>x.Code)) + 1; + } + + addOrEditNoneDicomStudy.Code = addOrEditNoneDicomStudy.Code ?? 0; var entity = await _noneDicomStudyRepository.InsertOrUpdateAsync(addOrEditNoneDicomStudy, false); - if (_repository.Entry(entity).State == Microsoft.EntityFrameworkCore.EntityState.Added) - { - entity.Code = _noneDicomStudyRepository.Where(t => t.TrialId == addOrEditNoneDicomStudy.TrialId).Select(t => t.Code).DefaultIfEmpty().Max() + 1; - } + entity.StudyCode = "NST" + entity.Code.ToString("D5"); await _repository.SaveChangesAsync();