修改影响上传切换磁盘预提交

2023-04-26 18:27:00 +08:00
parent 6a7971f314
commit 8c43bcf030
14 changed files with 455 additions and 109 deletions
@@ -92,7 +92,7 @@ namespace IRaCIS.Core.Application.Service.Common
            }
            else
            {
-                bestStoreRootFolder = Path.Combine(drives.FirstOrDefault()?.Name, _hostEnvironment.EnvironmentName);
+                bestStoreRootFolder = Path.Combine(bestDrive?.RootDirectory.FullName, _hostEnvironment.EnvironmentName);
            }


@@ -45,11 +45,9 @@ namespace IRaCIS.Core.Application.Contracts
        public string ResearchProgramNo { get; set; } = string.Empty;
        public string TrialIndication { get; set; } = string.Empty;

-        public CheckStateEnum CheckState { get; set; }


        public decimal VisitNum { get; set; }
-        public string SVUPDES { get; set; } = string.Empty;
        public string VisitName { get; set; } = string.Empty;
        public string Sponsor { get; set; } = string.Empty;
        public Guid TrialId { get; set; }
@@ -57,10 +55,15 @@ namespace IRaCIS.Core.Application.Contracts
        public Guid SubjectId { get; set; }
        public Guid SubjectVisitId { get; set; }

-        public SubmitStateEnum SubmitState { get; set; }

-        public AuditStateEnum AuditState { get; set; }
-        public ForwardStateEnum ForwardState { get; set; }
+        //public string SVUPDES { get; set; } = string.Empty;
+
+        //public CheckStateEnum CheckState { get; set; }
+
+        //public SubmitStateEnum SubmitState { get; set; }
+
+        //public AuditStateEnum AuditState { get; set; }
+        //public ForwardStateEnum ForwardState { get; set; }

        //public string SubjectName => LastName + " / " + FirstName;
        //public string FirstName { get; set; } = string.Empty;
@@ -34,7 +34,7 @@ namespace IRaCIS.Core.Application.Contracts

        public DateTime UploadTime { get; set; }

-        public string StudyCode  { get; set; }
+        public string StudyCode { get; set; }


        //[JsonIgnore]
@@ -69,7 +69,7 @@ namespace IRaCIS.Core.Application.Contracts
            }
        }

-        public string ArchiveIntervalStr 
+        public string ArchiveIntervalStr
        {
            get
            {
@@ -137,12 +137,12 @@ namespace IRaCIS.Core.Application.Contracts
    }


-    public class UnionStudyViewModel:UnionStudyBaseModel
+    public class UnionStudyViewModel : UnionStudyBaseModel
    {
-        
+
        public Guid Id { get; set; }

-        
+

        public int? Count { get; set; }

@@ -153,12 +153,12 @@ namespace IRaCIS.Core.Application.Contracts

        public DateTime? StudyTime { get; set; }

-       
+
    }



-    public class StudyQuery:PageInput
+    public class StudyQuery : PageInput
    {
        [NotDefault]
        public Guid TrialId { get; set; }
@@ -174,4 +174,116 @@ namespace IRaCIS.Core.Application.Contracts
        public string[]? VisitPlanArray { get; set; }

    }
+
+
+    public class NewArchiveStudyCommand
+    {
+        [NotDefault]
+        public Guid TrialId { get; set; }
+        [NotDefault]
+        public Guid SiteId { get; set; }
+        [NotDefault]
+        public Guid SubjectId { get; set; }
+        [NotDefault]
+        public Guid SubjectVisitId { get; set; }
+
+        public bool IsAdd { get; set; }
+
+        public AddOrUpdateStudyDto Study { get; set; }
+
+        public List<AddOrUpdateSeriesDto> SeriesList { get; set; }
+
+        public List<AddInstanceDto> InstanceList { get; set; }
+
+    }
+
+    public class AddOrUpdateStudyDto
+    {
+
+        public Guid? Id { get; set; }
+
+        public string StudyId { get; set; } = string.Empty;
+
+       
+
+        //public int Code { get; set; } = 0;
+
+        //public string StudyCode { get; set; } = string.Empty;
+
+
+        public string StudyInstanceUid { get; set; } = string.Empty;
+        public DateTime? StudyTime { get; set; }
+        public string Modalities { get; set; } = string.Empty;
+
+        public string Description { get; set; } = string.Empty;
+        public int SeriesCount { get; set; } = 0;
+        public int InstanceCount { get; set; } = 0;
+
+        public string InstitutionName { get; set; } = string.Empty;
+        public string PatientId { get; set; } = string.Empty;
+        public string PatientName { get; set; } = string.Empty;
+        public string PatientAge { get; set; } = string.Empty;
+        public string PatientSex { get; set; } = string.Empty;
+
+        public string AccessionNumber { get; set; } = string.Empty;
+        public string PatientBirthDate { get; set; } = string.Empty;
+        public string AcquisitionTime { get; set; } = string.Empty;
+        public string AcquisitionNumber { get; set; } = string.Empty;
+        public string TriggerTime { get; set; } = string.Empty;
+
+        public string BodyPartExamined { get; set; } = string.Empty;
+
+    }
+
+    public class AddOrUpdateSeriesDto
+    {
+        public Guid? Id { get; set; }
+        public string StudyInstanceUid { get; set; }
+        public string SeriesInstanceUid { get; set; }
+        public int SeriesNumber { get; set; }
+        public DateTime? SeriesTime { get; set; }
+        public string Modality { get; set; }
+        public string Description { get; set; }
+        public int InstanceCount { get; set; }
+        public string SliceThickness { get; set; }
+
+        public string ImagePositionPatient { get; set; }
+        public string ImageOrientationPatient { get; set; }
+        public string BodyPartExamined { get; set; }
+        public string SequenceName { get; set; }
+        public string ProtocolName { get; set; }
+        public string ImagerPixelSpacing { get; set; }
+
+        public string AcquisitionTime { get; set; } = string.Empty;
+        public string AcquisitionNumber { get; set; } = string.Empty;
+        public string TriggerTime { get; set; } = string.Empty;
+
+    }
+
+
+    public class AddInstanceDto
+    {
+        public string StudyInstanceUid { get; set; }
+        public string SeriesInstanceUid { get; set; }
+        public string SopInstanceUid { get; set; }
+        public int InstanceNumber { get; set; }
+        public DateTime? InstanceTime { get; set; }
+        public bool CPIStatus { get; set; }
+        public int ImageRows { get; set; }
+        public int ImageColumns { get; set; }
+        public int SliceLocation { get; set; }
+
+
+        public string SliceThickness { get; set; }
+        public int NumberOfFrames { get; set; }
+        public string PixelSpacing { get; set; }
+
+        public string ImagerPixelSpacing { get; set; }
+        public string FrameOfReferenceUID { get; set; }
+        public string WindowCenter { get; set; }
+        public string WindowWidth { get; set; }
+
+        public bool Anonymize { get; set; }
+        public string Path { get; set; }
+    }
 }
@@ -12,6 +12,6 @@ namespace IRaCIS.Core.Application.Contracts
        DicomTrialSiteSubjectInfo GetSaveToDicomInfo(Guid subjectVisitId);
        IResponseOutput<DicomStudyDTO> Item(Guid studyId);
        Task<FileContentResult> Preview(Guid studyId);
-        IResponseOutput<List<VerifyStudyUploadResult>> VerifyStudyAllowUpload(VerifyUploadOrReupload verifyInfo);
+        //IResponseOutput<List<VerifyStudyUploadResult>> VerifyStudyAllowUpload(VerifyUploadOrReupload verifyInfo);
    }
 }
@@ -7,12 +7,15 @@ using EasyCaching.Core;
 using System.Linq.Expressions;
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Infrastructure;
+using DocumentFormat.OpenXml.Presentation;
+using IRaCIS.Core.Domain.Models;

 namespace IRaCIS.Core.Application.Service.ImageAndDoc
 {
    [ApiExplorerSettings(GroupName = "Image")]
    public class StudyService : BaseService, IStudyService
    {
+        private static object lockCodeGenerate = new object();

        private readonly IEasyCachingProvider _provider;

@@ -20,16 +23,185 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
        private readonly IRepository<SubjectVisit> _subjectVisitRepository;
        private readonly IRepository<DicomInstance> _dicomInstanceRepository;
        private readonly IRepository<DicomSeries> _dicomSeriesRepository;
+        private readonly IRepository<DicomStudy> _dicomstudyRepository;
+        private readonly IRepository<Dictionary> _dictionaryRepository;

-        public StudyService( IEasyCachingProvider provider
+        public StudyService(IEasyCachingProvider provider
            , IRepository<SubjectVisit> subjectVisitRepository,
            IRepository<DicomInstance> dicomInstanceRepository,
-            IRepository<DicomSeries> dicomSeriesRepository)
+            IRepository<DicomSeries> dicomSeriesRepository, IRepository<DicomStudy> dicomstudyRepository, IRepository<Dictionary> dictionaryRepository)
        {
            _provider = provider;
            _subjectVisitRepository = subjectVisitRepository;
            _dicomInstanceRepository = dicomInstanceRepository;
            _dicomSeriesRepository = dicomSeriesRepository;
+            _dicomstudyRepository = dicomstudyRepository;
+            _dictionaryRepository = dictionaryRepository;
+        }
+
+
+        private void SpecialArchiveStudyDeal(DicomStudy study)
+        {
+            #region 特殊逻辑
+
+
+            if (study.PatientBirthDate.Length == 8)
+            {
+                study.PatientBirthDate = $"{study.PatientBirthDate[0]}{study.PatientBirthDate[1]}{study.PatientBirthDate[2]}{study.PatientBirthDate[3]}-{study.PatientBirthDate[4]}{study.PatientBirthDate[5]}-{study.PatientBirthDate[6]}{study.PatientBirthDate[7]}";
+            }
+
+            var dicModalityList = _dictionaryRepository.Where(t => t.Code == "Modality").SelectMany(t => t.ChildList.Select(c => c.Value)).ToList();
+
+
+            var modality = study.Modalities;
+
+            var modalityForEdit = dicModalityList.Contains(modality) ? modality : String.Empty;
+
+            if (modality == "MR")
+            {
+                modalityForEdit = "MRI";
+            }
+
+            if (modality == "PT")
+            {
+                modalityForEdit = "PET";
+            }
+            if (modality == "PT、CT")
+            {
+                modalityForEdit = "PET-CT";
+            }
+
+            study.ModalityForEdit = modalityForEdit;
+            #endregion
+        }
+
+        public async Task<IResponseOutput> AddOrUpdateArchiveStudy(NewArchiveStudyCommand incommand)
+        {
+            var trialId = incommand.TrialId;
+            if (incommand.IsAdd)
+            {
+                var study = _mapper.Map<DicomStudy>(incommand.Study);
+
+                lock (lockCodeGenerate)
+                {
+
+                    //查询数据库获取最大的Code 没有记录则为0
+                    var dbStudyCodeIntMax = _dicomstudyRepository.Where(s => s.TrialId == trialId).Select(t => t.Code).DefaultIfEmpty().Max();
+
+                    //获取缓存中的值 并发的时候，需要记录，已被占用的值 这样其他线程在此占用的最大的值上递增
+                    var cacheMaxCodeInt = _provider.Get<int>($"{trialId}_{StaticData.CacheKey.StudyMaxCode}").Value;
+
+                    int currentNextCodeInt = cacheMaxCodeInt > dbStudyCodeIntMax ? cacheMaxCodeInt + 1 : dbStudyCodeIntMax + 1;
+
+                    study.Code = currentNextCodeInt;
+
+                    study.StudyCode = AppSettings.GetCodeStr(currentNextCodeInt, nameof(DicomStudy));
+
+                    _provider.Set<int>($"{trialId}_{StaticData.CacheKey.StudyMaxCode}", study.Code, TimeSpan.FromMinutes(30));
+
+                }
+
+
+                study.Id = IdentifierHelper.CreateGuid(incommand.Study.StudyInstanceUid, incommand.TrialId.ToString());
+                study.TrialId = incommand.TrialId;
+                study.SiteId = incommand.SiteId;
+                study.SubjectId = incommand.SubjectId;
+                study.SubjectVisitId = incommand.SubjectVisitId;
+
+
+                //特殊处理逻辑
+                SpecialArchiveStudyDeal(study);
+
+
+
+                await _dicomstudyRepository.AddAsync(study);
+
+
+                foreach (var seriesItem in incommand.SeriesList)
+                {
+                    var series = _mapper.Map<DicomSeries>(seriesItem);
+
+                    series.Id = IdentifierHelper.CreateGuid(seriesItem.SeriesInstanceUid, incommand.TrialId.ToString());
+                    series.StudyId = study.Id;
+
+                    series.TrialId = incommand.TrialId;
+                    series.SiteId = incommand.SiteId;
+                    series.SubjectId = incommand.SubjectId;
+                    series.SubjectVisitId = incommand.SubjectVisitId;
+
+                    await _dicomSeriesRepository.AddAsync(series);
+
+                    foreach (var instanceItem in incommand.InstanceList)
+                    {
+                        var isntance = _mapper.Map<DicomInstance>(instanceItem);
+                        isntance.StudyId = study.Id;
+                        isntance.SeriesId = series.Id;
+
+                        isntance.TrialId = incommand.TrialId;
+                        isntance.SiteId = incommand.SiteId;
+                        isntance.SubjectId = incommand.SubjectId;
+                        isntance.SubjectVisitId = incommand.SubjectVisitId;
+
+                        await _dicomInstanceRepository.AddAsync(isntance);
+                    }
+                }
+
+
+
+            }
+            else
+            {
+
+                var studyId = incommand.Study.Id;
+
+                var study = await _dicomstudyRepository.FirstOrDefaultAsync(t => t.Id == studyId);
+
+                _mapper.Map(incommand.Study, study);
+
+                //特殊处理逻辑
+                SpecialArchiveStudyDeal(study);
+
+                await _dicomSeriesRepository.BatchDeleteNoTrackingAsync(t => t.StudyId == incommand.Study.Id);
+
+
+                foreach (var seriesItem in incommand.SeriesList)
+                {
+                    var series = _mapper.Map<DicomSeries>(seriesItem);
+
+                    series.Id =  IdentifierHelper.CreateGuid(series.StudyInstanceUid, series.SeriesInstanceUid, trialId.ToString()); 
+                    series.StudyId = study.Id;
+
+                    series.TrialId = incommand.TrialId;
+                    series.SiteId = incommand.SiteId;
+                    series.SubjectId = incommand.SubjectId;
+                    series.SubjectVisitId = incommand.SubjectVisitId;
+
+                    await _dicomSeriesRepository.AddAsync(series);
+
+                    foreach (var instanceItem in incommand.InstanceList)
+                    {
+                        var insntance = _mapper.Map<DicomInstance>(instanceItem);
+                        insntance.Id= IdentifierHelper.CreateGuid(insntance.StudyInstanceUid, insntance.SeriesInstanceUid, insntance.SopInstanceUid, trialId.ToString());
+                        insntance.StudyId = study.Id;
+                        insntance.SeriesId = series.Id;
+
+                        insntance.TrialId = incommand.TrialId;
+                        insntance.SiteId = incommand.SiteId;
+                        insntance.SubjectId = incommand.SubjectId;
+                        insntance.SubjectVisitId = incommand.SubjectVisitId;
+
+                        await _dicomInstanceRepository.AddAsync(insntance);
+                    }
+                }
+
+                // 少了整个序列
+
+                //某个序列下少了instance
+            }
+
+            await _dicomstudyRepository.SaveChangesAsync();
+
+            return ResponseOutput.Ok();
        }


@@ -151,7 +323,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
        public async Task<PageOutput<UnionStudyMonitorModel>> GetDicomAndNoneDicomStudyMonitorList(StudyQuery studyQuery)
        {
            var svExpression = QCCommon.GetStudyMonitorSubjectVisitFilter(studyQuery.VisitPlanArray);
-            var StudyMonitorQuery = _repository.Where<StudyMonitor>(t => t.TrialId == studyQuery.TrialId,ignoreQueryFilters:true)
+            var StudyMonitorQuery = _repository.Where<StudyMonitor>(t => t.TrialId == studyQuery.TrialId, ignoreQueryFilters: true)
                 .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA, t => t.TrialSite.CRCUserList.Any(t => t.UserId == _userInfo.Id))
                  //.WhereIf(!string.IsNullOrEmpty(studyQuery.VisitPlanInfo), studyQuery.VisitPlanInfo.Contains('.') ? t => t.SubjectVisit.VisitNum.ToString().Contains(".") : t => t.SubjectVisit.VisitNum == decimal.Parse(studyQuery.VisitPlanInfo))
                  .WhereIf(studyQuery.VisitPlanArray != null && studyQuery.VisitPlanArray?.Length > 0, svExpression)
@@ -181,14 +353,14 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc

                     UploadTime = t.CreateTime,

-                     IsSuccess=t.IsSuccess,
-                     Note=t.Note,
+                     IsSuccess = t.IsSuccess,
+                     Note = t.Note,
                     IP = t.IP,
                     FileCount = t.FileCount,
                     FileSize = t.FileSize,
                     UploadFinishedTime = t.UploadFinishedTime,
                     UploadStartTime = t.UploadStartTime,
-                     ArchiveFinishedTime=t.ArchiveFinishedTime,
+                     ArchiveFinishedTime = t.ArchiveFinishedTime,



@@ -403,7 +575,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
        /// 批量验证 检查是否可以上传 并告知原因
        /// </summary>
        [HttpPost]
-        public IResponseOutput<List<VerifyStudyUploadResult>> VerifyStudyAllowUpload(VerifyUploadOrReupload verifyInfo)
+        public (List<VerifyStudyUploadResult>, object?) VerifyStudyAllowUpload(VerifyUploadOrReupload verifyInfo)
        {
            var trialInfo = _repository.Where<Trial>().FirstOrDefault(t => t.Id == verifyInfo.TrialId).IfNullThrowException();

@@ -428,7 +600,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                        result.Add(new VerifyStudyUploadResult() { ErrorMesseage = _localizer["Study_VisitBeforePrevError", waitUploadItem.StudyDate?.ToString("yyyy-MM-dd"), before?.ToString("yyyy-MM-dd")], StudyInstanceUid = waitUploadItem.StudyInstanceUid });
                        return;
                    }
-                   
+
                    //大于当前访视 最近的最早拍片日期  
                    var after = visitList.Where(u => u.VisitNum > verifyInfo.VisitNum).Min(k => k.EarliestScanDate);

@@ -445,7 +617,19 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                result.Add(temp);
            });

-            return ResponseOutput.Ok(result);
+
+            // 写入dicom 固定的信息，以及组织路径的信息  以及匿名化的信息
+            var otherData = GetSaveToDicomInfo(verifyInfo.SubjectVisitId);
+
+            var systemAnonymizationList = _repository.Where<SystemAnonymization>(t => t.IsEnable).ToList();
+
+            return (result, new
+            {
+                DicomStoreInfo = otherData,
+                AnonymizeFixedList = systemAnonymizationList.Where(t => t.IsFixed).ToList(),
+                AnonymizeNotFixedList = systemAnonymizationList.Where(t => t.IsFixed == false).ToList()
+            }
+            );
        }


@@ -498,6 +682,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                if (verifyStudyInfo.SubjectId == SubjectId && verifyStudyInfo.SubjectVisitId == currentSubjectVisitId)
                {
                    result.AllowReUpload = true;
+
+                    result.UploadedSeriesList = _repository.Where<DicomSeries>(t => t.StudyId == verifyStudyInfo.Id).Select(t => new UploadedSeries()
+                    { SeriesInstanceUid = t.SeriesInstanceUid, SOPInstanceUIDList = t.DicomInstanceList.Select(c => c.SopInstanceUid).ToList() }).ToList();
                }
                //不是同一个受试者
                else
@@ -12,6 +12,10 @@ namespace IRaCIS.Core.Application.Service
    {
        public ImageAndDocConfig()
        {
+            CreateMap<AddOrUpdateStudyDto, DicomStudy>();
+            CreateMap<AddOrUpdateSeriesDto, DicomSeries>();
+            CreateMap<AddInstanceDto, DicomInstance>();
+
            CreateMap<Report, ReportDTO>();
            CreateMap<ImageLabel, ImageLabelDTO>();
            CreateMap<DicomSeries, DicomSeriesWithLabelDTO>();
@@ -31,7 +35,6 @@ namespace IRaCIS.Core.Application.Service
            .ForMember(d => d.SiteName, u => u.MapFrom(s => s.Site.SiteName))
            .ForMember(d => d.UploaderFirstName, u => u.MapFrom(s => s.Uploader.FirstName))
            .ForMember(d => d.UploaderLastName, u => u.MapFrom(s => s.Uploader.LastName))
-             .ForMember(d => d.StudyStatus, u => u.MapFrom(s => s.Status))
              .ForMember(d => d.UploadedTime, u => u.MapFrom(s => s.CreateTime))

            .ForMember(d => d.DTFCount, u => u.MapFrom(s => s.StudyDTFList.Count()));
@@ -317,6 +317,13 @@ namespace IRaCIS.Core.Application.Contracts



+    public class UploadedSeries
+    {
+        public string SeriesInstanceUid { get; set; }
+
+        public List<string> SOPInstanceUIDList { get; set; }
+    }
+

    public class VerifyStudyUploadResult
    {
@@ -330,6 +337,8 @@ namespace IRaCIS.Core.Application.Contracts

        public string ErrorMesseage { get; set; } = String.Empty;

+        public List<UploadedSeries> UploadedSeriesList { get; set;} = new List<UploadedSeries>();
+
    }

    public class VerifyUploadOrReupload