修改国际化
parent
2fe52b341e
commit
3d5be3b368
|
@ -11,7 +11,7 @@
|
||||||
public Guid StudyId { get; set; }
|
public Guid StudyId { get; set; }
|
||||||
public string StudyInstanceUid { get; set; } = String.Empty;
|
public string StudyInstanceUid { get; set; } = String.Empty;
|
||||||
public string SeriesInstanceUid { 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 DateTime? SeriesTime { get; set; }
|
||||||
public string Modality { get; set; } = String.Empty;
|
public string Modality { get; set; } = String.Empty;
|
||||||
public string Description { get; set; }=String.Empty;
|
public string Description { get; set; }=String.Empty;
|
||||||
|
|
|
@ -377,7 +377,7 @@ namespace IRaCIS.Core.Application.Services
|
||||||
|
|
||||||
StudyInstanceUid = dicomStudy.StudyInstanceUid,
|
StudyInstanceUid = dicomStudy.StudyInstanceUid,
|
||||||
SeriesInstanceUid = seriesInstanceUid,
|
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 = dataset.GetSingleValueOrDefault(DicomTag.SeriesDate, DateTime.Now).Add(dataset.GetSingleValueOrDefault(DicomTag.SeriesTime, DateTime.Now).TimeOfDay),
|
||||||
//SeriesTime = DateTime.TryParse(dataset.GetSingleValue<string>(DicomTag.SeriesDate) + dataset.GetSingleValue<string>(DicomTag.SeriesTime), out DateTime dt) ? dt : null,
|
//SeriesTime = DateTime.TryParse(dataset.GetSingleValue<string>(DicomTag.SeriesDate) + dataset.GetSingleValue<string>(DicomTag.SeriesTime), out DateTime dt) ? dt : null,
|
||||||
SeriesTime = dataset.GetSingleValueOrDefault(DicomTag.SeriesDate, string.Empty) == string.Empty ? null : dataset.GetSingleValue<DateTime>(DicomTag.SeriesDate).Add(dataset.GetSingleValueOrDefault(DicomTag.SeriesTime, string.Empty) == string.Empty ? TimeSpan.Zero : dataset.GetSingleValue<DateTime>(DicomTag.SeriesTime).TimeOfDay),
|
SeriesTime = dataset.GetSingleValueOrDefault(DicomTag.SeriesDate, string.Empty) == string.Empty ? null : dataset.GetSingleValue<DateTime>(DicomTag.SeriesDate).Add(dataset.GetSingleValueOrDefault(DicomTag.SeriesTime, string.Empty) == string.Empty ? TimeSpan.Zero : dataset.GetSingleValue<DateTime>(DicomTag.SeriesTime).TimeOfDay),
|
||||||
|
|
|
@ -64,17 +64,17 @@ namespace IRaCIS.Core.Application.Services
|
||||||
|
|
||||||
if (imageShare == null)
|
if (imageShare == null)
|
||||||
{
|
{
|
||||||
return ResponseOutput.NotOk("资源不存在。");
|
return ResponseOutput.NotOk("The image resource does not exist");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pWord != imageShare.Password.Trim())
|
if (pWord != imageShare.Password.Trim())
|
||||||
{
|
{
|
||||||
return ResponseOutput.NotOk("分享密码错误。");
|
return ResponseOutput.NotOk("Sharing Password Incorrect");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (DateTime.Now > imageShare.ExpireTime)
|
if (DateTime.Now > imageShare.ExpireTime)
|
||||||
{
|
{
|
||||||
return ResponseOutput.NotOk("资源分享过期。");
|
return ResponseOutput.NotOk("Resource sharing expires.");
|
||||||
}
|
}
|
||||||
|
|
||||||
var vitrualUserId = Guid.NewGuid();
|
var vitrualUserId = Guid.NewGuid();
|
||||||
|
|
|
@ -411,7 +411,7 @@ namespace IRaCIS.Core.Application.Contracts.DTO
|
||||||
public string BodyPartForEdit { get; set; } = String.Empty;
|
public string BodyPartForEdit { get; set; } = String.Empty;
|
||||||
|
|
||||||
public string SeriesInstanceUid { 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 DateTime? SeriesTime { get; set; }
|
||||||
public string Modality { get; set; } = String.Empty;
|
public string Modality { get; set; } = String.Empty;
|
||||||
public string Description { get; set; } = String.Empty;
|
public string Description { get; set; } = String.Empty;
|
||||||
|
|
|
@ -1072,7 +1072,7 @@ namespace IRaCIS.Core.Application.Image.QA
|
||||||
if (nameList.Count() > 0)
|
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))
|
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)
|
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))
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
//获取确认的临床数据配置
|
//获取确认的临床数据配置
|
||||||
|
|
|
@ -510,7 +510,7 @@ namespace IRaCIS.Core.Application.Services
|
||||||
SiteId=nodicom.SiteId,
|
SiteId=nodicom.SiteId,
|
||||||
SubjectVisitId=nodicom.SubjectVisitId,
|
SubjectVisitId=nodicom.SubjectVisitId,
|
||||||
SubjectId=nodicom.SubjectId,
|
SubjectId=nodicom.SubjectId,
|
||||||
SeriesNumber=1,
|
SeriesNumber=string.Empty,
|
||||||
NoneDicomFileFirstFile=await _noneDicomStudyFileRepository.Where(x=>x.NoneDicomStudyId==item.StudyId).Select(x=>x.Path).FirstOrDefaultAsync(),
|
NoneDicomFileFirstFile=await _noneDicomStudyFileRepository.Where(x=>x.NoneDicomStudyId==item.StudyId).Select(x=>x.Path).FirstOrDefaultAsync(),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@ namespace IRaCIS.Core.Domain.Models
|
||||||
public Guid StudyId { get; set; }
|
public Guid StudyId { get; set; }
|
||||||
public string StudyInstanceUid { get; set; }
|
public string StudyInstanceUid { get; set; }
|
||||||
public string SeriesInstanceUid { 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 DateTime? SeriesTime { get; set; }
|
||||||
public string Modality { get; set; }
|
public string Modality { get; set; }
|
||||||
public string Description { get; set; }
|
public string Description { get; set; }
|
||||||
|
|
|
@ -19,7 +19,7 @@ public static class StaticData
|
||||||
|
|
||||||
public static class Folder
|
public static class Folder
|
||||||
{
|
{
|
||||||
public static readonly string IRaCISDataFolder = "EIImageViewerData";
|
public static readonly string IRaCISDataFolder = "EIMedViewerData";
|
||||||
|
|
||||||
public static readonly string TempFileFolder = "TempFile";
|
public static readonly string TempFileFolder = "TempFile";
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue