From 3d5be3b368fe31ac5dbeb95d7397dc032b67a1ac Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 29 Nov 2023 13:31:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ImageAndDoc/DTO/DicomSeriesModel.cs | 2 +- .../Service/ImageAndDoc/DicomArchiveService.cs | 2 +- .../Service/ImageAndDoc/ImageShareService.cs | 6 +++--- .../Service/QC/DTO/QARecordViewModel.cs | 2 +- IRaCIS.Core.Application/Service/QC/QCOperationService.cs | 8 ++++---- .../Service/Visit/SubjectVisitService.cs | 2 +- IRaCIS.Core.Domain/Image/DicomSeries.cs | 2 +- IRaCIS.Core.Domain/_Config/_StaticData.cs | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs index eca8d7f..62f73fb 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs @@ -11,7 +11,7 @@ public Guid StudyId { get; set; } public string StudyInstanceUid { get; set; } = String.Empty; public string SeriesInstanceUid { get; set; } = String.Empty; - public int SeriesNumber { get; set; } + public string SeriesNumber { get; set; } public DateTime? SeriesTime { get; set; } public string Modality { get; set; } = String.Empty; public string Description { get; set; }=String.Empty; diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs index cd5f2de..3b3577d 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs @@ -377,7 +377,7 @@ namespace IRaCIS.Core.Application.Services StudyInstanceUid = dicomStudy.StudyInstanceUid, SeriesInstanceUid = seriesInstanceUid, - SeriesNumber = dataset.GetSingleValueOrDefault(DicomTag.SeriesNumber, 1), + SeriesNumber = dataset.GetSingleValueOrDefault(DicomTag.SeriesNumber, string.Empty), //SeriesTime = dataset.GetSingleValueOrDefault(DicomTag.SeriesDate, DateTime.Now).Add(dataset.GetSingleValueOrDefault(DicomTag.SeriesTime, DateTime.Now).TimeOfDay), //SeriesTime = DateTime.TryParse(dataset.GetSingleValue(DicomTag.SeriesDate) + dataset.GetSingleValue(DicomTag.SeriesTime), out DateTime dt) ? dt : null, SeriesTime = dataset.GetSingleValueOrDefault(DicomTag.SeriesDate, string.Empty) == string.Empty ? null : dataset.GetSingleValue(DicomTag.SeriesDate).Add(dataset.GetSingleValueOrDefault(DicomTag.SeriesTime, string.Empty) == string.Empty ? TimeSpan.Zero : dataset.GetSingleValue(DicomTag.SeriesTime).TimeOfDay), diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/ImageShareService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/ImageShareService.cs index d10d236..0d928bf 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/ImageShareService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/ImageShareService.cs @@ -64,17 +64,17 @@ namespace IRaCIS.Core.Application.Services if (imageShare == null) { - return ResponseOutput.NotOk("资源不存在。"); + return ResponseOutput.NotOk("The image resource does not exist"); } if (pWord != imageShare.Password.Trim()) { - return ResponseOutput.NotOk("分享密码错误。"); + return ResponseOutput.NotOk("Sharing Password Incorrect"); } if (DateTime.Now > imageShare.ExpireTime) { - return ResponseOutput.NotOk("资源分享过期。"); + return ResponseOutput.NotOk("Resource sharing expires."); } var vitrualUserId = Guid.NewGuid(); diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs index 52a41a8..f668b51 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs @@ -411,7 +411,7 @@ namespace IRaCIS.Core.Application.Contracts.DTO public string BodyPartForEdit { get; set; } = String.Empty; public string SeriesInstanceUid { get; set; } = String.Empty; - public int SeriesNumber { get; set; } + public string SeriesNumber { get; set; } public DateTime? SeriesTime { get; set; } public string Modality { get; set; } = String.Empty; public string Description { get; set; } = String.Empty; diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index 620a3c0..e706077 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -1072,7 +1072,7 @@ namespace IRaCIS.Core.Application.Image.QA if (nameList.Count() > 0) { - return ResponseOutput.NotOk($"在提交当前检查批次后，请尽快处理尚未提交的前序检查批次：{string.Join('、', nameList)}。", 0, ApiResponseCodeEnum.NeedTips); + return ResponseOutput.NotOk($"After submitted the current study batch, please process the unsubmitted previous study batchs as soon as possible ：{string.Join('、', nameList)}。", 0, ApiResponseCodeEnum.NeedTips); } } } @@ -1120,17 +1120,17 @@ namespace IRaCIS.Core.Application.Image.QA if (dbSubjectVisitList.Any(t => t.SubmitState == SubmitStateEnum.None)) { - return ResponseOutput.NotOk("有检查批次未上传任何影像数据，不允许提交"); + return ResponseOutput.NotOk("There's visit which did not upload any image, the submission is not allowed."); } //单个提交提示信息 if (dbSubjectVisitList.Count() == 1 && dbSubjectVisitList.First().SubmitState == SubmitStateEnum.Submitted) { - return ResponseOutput.NotOk("当前检查批次的影像数据，已经由其他IC提交。", 3, ApiResponseCodeEnum.NeedTips); + return ResponseOutput.NotOk("Images of the current visit have been submitted by other IC.", 3, ApiResponseCodeEnum.NeedTips); } else if (dbSubjectVisitList.Any(t => t.SubmitState == SubmitStateEnum.Submitted)) { - return ResponseOutput.NotOk("当前批量提交检查批次的影像数据，其中部分已由其他IC提交。", 3, ApiResponseCodeEnum.NeedTips); + return ResponseOutput.NotOk("Images of the visits to be submitted in batch, some of which have been submitted by other IC.", 3, ApiResponseCodeEnum.NeedTips); } //获取确认的临床数据配置 diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs index 2f0d176..c4ab9f6 100644 --- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs +++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs @@ -510,7 +510,7 @@ namespace IRaCIS.Core.Application.Services SiteId=nodicom.SiteId, SubjectVisitId=nodicom.SubjectVisitId, SubjectId=nodicom.SubjectId, - SeriesNumber=1, + SeriesNumber=string.Empty, NoneDicomFileFirstFile=await _noneDicomStudyFileRepository.Where(x=>x.NoneDicomStudyId==item.StudyId).Select(x=>x.Path).FirstOrDefaultAsync(), } diff --git a/IRaCIS.Core.Domain/Image/DicomSeries.cs b/IRaCIS.Core.Domain/Image/DicomSeries.cs index 094c4f6..28fc653 100644 --- a/IRaCIS.Core.Domain/Image/DicomSeries.cs +++ b/IRaCIS.Core.Domain/Image/DicomSeries.cs @@ -21,7 +21,7 @@ namespace IRaCIS.Core.Domain.Models public Guid StudyId { get; set; } public string StudyInstanceUid { get; set; } public string SeriesInstanceUid { get; set; } - public int SeriesNumber { get; set; } + public string SeriesNumber { get; set; } = string.Empty; public DateTime? SeriesTime { get; set; } public string Modality { get; set; } public string Description { get; set; } diff --git a/IRaCIS.Core.Domain/_Config/_StaticData.cs b/IRaCIS.Core.Domain/_Config/_StaticData.cs index cf35d79..56f6ea6 100644 --- a/IRaCIS.Core.Domain/_Config/_StaticData.cs +++ b/IRaCIS.Core.Domain/_Config/_StaticData.cs @@ -19,7 +19,7 @@ public static class StaticData public static class Folder { - public static readonly string IRaCISDataFolder = "EIImageViewerData"; + public static readonly string IRaCISDataFolder = "EIMedViewerData"; public static readonly string TempFileFolder = "TempFile";