diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs index 3124f5d84..6e5748018 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs @@ -102,6 +102,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc.DTO public string BodyPartForEdit { get; set; } + public string BodyPartForEditOther { get; set; } + public DateTime? StudyTime { get; set; } public string Modalities { get; set; } @@ -126,6 +128,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc.DTO public string BodyPart { get; set; } + public string BodyPartForEditOther { get; set; } + public string Modality { get; set; } public DateTime ImageDate { get; set; } diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs index d858c96f1..ff33f0b44 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs @@ -190,6 +190,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc ModalityForEdit = t.ModalityForEdit, BodyPartExamined = t.BodyPartExamined, BodyPartForEdit = t.BodyPartForEdit, + BodyPartForEditOther = t.BodyPartForEditOther, StudyCode = t.StudyCode, StudyTime = t.StudyTime, @@ -209,6 +210,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc ModalityForEdit = t.ModalityForEdit, BodyPartExamined = t.BodyPartExamined, BodyPartForEdit = t.BodyPartForEdit, + BodyPartForEditOther = t.BodyPartForEditOther, StudyCode = t.StudyCode, StudyTime = t.StudyTime, @@ -524,6 +526,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc await _taskInstanceRepository.AddAsync(isntance); } } + + + findStudy = study; } else { @@ -609,6 +614,30 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc } + #region 只配置单个部位自动赋值 + + var originStudy = _dicomStudyRepository.Where(t => t.TrialId == incommand.TrialId && t.StudyInstanceUid == findStudy.StudyInstanceUid).FirstOrDefault(); + + if (originStudy != null) + { + findStudy.BodyPartForEdit = originStudy.BodyPartForEdit; + + findStudy.BodyPartForEditOther = originStudy.BodyPartForEditOther; + } + + + ////项目配置的影像部位 + //var trialBodyParts = _trialRepository.Where(t => t.Id == trialId).Select(t => t.BodyPartTypes).FirstOrDefault(); + + //var trialBodyPartList = trialBodyParts.Split('|', StringSplitOptions.RemoveEmptyEntries); + + //if (trialBodyPartList.Count() == 1) + //{ + // var first = trialBodyPartList.First(); + // findStudy.BodyPartForEdit = first; + //} + #endregion + var @lock2 = _distributedLockProvider.CreateLock($"StudyCommit"); using (await @lock2.AcquireAsync()) @@ -734,6 +763,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc Description = ns.Description, ImageDate = ns.ImageDate, BodyPart = ns.BodyPart, + BodyPartForEditOther=ns.BodyPartForEditOther, FileCount = ns.FileCount, Modality = ns.Modality, StudyCode = ns.StudyCode, diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs index 644bae462..e46c85f9f 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs @@ -323,29 +323,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc } - #region 只配置单个部位自动赋值 - - var originStudy = _dicomStudyRepository.Where(t => t.TrialId == incommand.TrialId && t.StudyInstanceUid == findStudy.StudyInstanceUid).FirstOrDefault(); - - if(originStudy != null) - { - findStudy.BodyPartForEdit=originStudy.BodyPartForEdit; - - findStudy.BodyPartForEditOther = originStudy.BodyPartForEditOther; - } - - - ////项目配置的影像部位 - //var trialBodyParts = _trialRepository.Where(t => t.Id == trialId).Select(t => t.BodyPartTypes).FirstOrDefault(); - - //var trialBodyPartList = trialBodyParts.Split('|', StringSplitOptions.RemoveEmptyEntries); - - //if (trialBodyPartList.Count() == 1) - //{ - // var first = trialBodyPartList.First(); - // findStudy.BodyPartForEdit = first; - //} - #endregion + var @lock2 = _distributedLockProvider.CreateLock($"StudyCommit");