XCKJ/irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

国际化修改

Browse Source
This commit is contained in:
he
2023-03-29 11:43:48 +08:00
parent e7f17f97d6
commit cb2aa0cfa4
16 changed files with 74 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs
+3 -2
View File
@@ -11,7 +11,7 @@ using IRaCIS.Core.Infrastructure;
namespace IRaCIS.Core.Application.Services
{
public class DicomArchiveService : IDicomArchiveService
public class DicomArchiveService :BaseService, IDicomArchiveService
{
private readonly IRepository<DicomStudy> _studyRepository;
private readonly IRepository<DicomSeries> _seriesRepository;
@@ -80,7 +80,8 @@ namespace IRaCIS.Core.Application.Services
if (anonymize_AddFixedFiledList.Union(anonymize_AddIRCInfoFiledList).Union(anonymize_FixedFieldList).Union(anonymize_IRCInfoFieldList).Count() == 0)
{
throw new BusinessValidationFailedException("未取到缓存匿名化配置数据，上传停止,请联系开发人员核实");
//---未取到缓存匿名化配置数据，上传停止,请联系开发人员核实
throw new BusinessValidationFailedException(_localizer["DAS_NoAnonCacheData"]);
}
IRaCIS.Core.Application/Service/ImageAndDoc/ImageShareService.cs
+9 -5
View File
@@ -55,7 +55,8 @@ namespace IRaCIS.Core.Application.Services
if (!studyIds.Any())
{
return ResponseOutput.NotOk("当前检查没有影像可以分享。 ");
//---当前检查没有影像可以分享。
return ResponseOutput.NotOk(_localizer["ISS_NoImgToShare"]);
}
imageShareCommand.StudyId = studyIds.First();
@@ -93,17 +94,20 @@ namespace IRaCIS.Core.Application.Services
if (imageShare == null)
{
return ResponseOutput.NotOk("资源不存在。");
//---资源不存在。
return ResponseOutput.NotOk(_localizer["ISS_ResNotExists"]);
}
if (pWord != imageShare.Password.Trim())
{
return ResponseOutput.NotOk("分享密码错误。");
//---分享密码错误。
return ResponseOutput.NotOk(_localizer["ISS_SharePwdError"]);
}
if (DateTime.Now > imageShare.ExpireTime)
{
return ResponseOutput.NotOk("资源分享过期。");
//---资源分享过期。
return ResponseOutput.NotOk(_localizer["ISS_ShareExpiration"]);
}
var resource = new ResourceInfo()
@@ -128,4 +132,4 @@ namespace IRaCIS.Core.Application.Services
}
}
}
}
IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
+12 -6
View File
@@ -423,16 +423,19 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
if (before != null && waitUploadItem.StudyDate != null && before > waitUploadItem.StudyDate)
{
result.Add(new VerifyStudyUploadResult() { ErrorMesseage = $"当前访视检查时间{waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")}不能早于前序访视检查时间{before?.ToString("yyyy-MM-dd")}，请核对检查数据是否有误", StudyInstanceUid = waitUploadItem.StudyInstanceUid });
// $"当前访视检查时间{waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")}不能早于前序访视检查时间{before?.ToString("yyyy-MM-dd")}，请核对检查数据是否有误",
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);
if (after != null && waitUploadItem.StudyDate != null && after < waitUploadItem.StudyDate)
{
result.Add(new VerifyStudyUploadResult() { ErrorMesseage = $"当前访视检查时间{waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")}不能晚于该访视之后的检查时间{after?.ToString("yyyy-MM-dd")}，请核对检查数据是否有误", StudyInstanceUid = waitUploadItem.StudyInstanceUid });
// $"当前访视检查时间{waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")}不能晚于该访视之后的检查时间{after?.ToString("yyyy-MM-dd")}，请核对检查数据是否有误"
result.Add(new VerifyStudyUploadResult() { ErrorMesseage = _localizer["Study_VisitAfterSubseqError", waitUploadItem.StudyDate?.ToString("yyyy-MM-dd"), after?.ToString("yyyy-MM-dd")], StudyInstanceUid = waitUploadItem.StudyInstanceUid });
return;
}
}
@@ -457,7 +460,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
result.AllowReUpload = false;
result.StudyInstanceUid = studyInstanceUid;
result.ErrorMesseage = "当前有人正在上传归档该检查!";
//---当前有人正在上传归档该检查!
result.ErrorMesseage = _localizer["Study_UploadArchiving"];
return result;
}
@@ -468,7 +472,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
result.AllowReUpload = false;
result.StudyInstanceUid = studyInstanceUid;
result.ErrorMesseage = "受试者访视结束，不允许上传!";
//---受试者访视结束，不允许上传!
result.ErrorMesseage = _localizer["Study_VisitEndedNotAllowed"];
return result;
}
@@ -502,7 +507,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
result.AllowReUpload = false;
result.ErrorMesseage = $"此处不可以上传。当前影像检查已经上传给受试者{verifyStudyInfo.SubjectCode}的{verifyStudyInfo.VisitName}";
//$"此处不可以上传。当前影像检查已经上传给受试者{verifyStudyInfo.SubjectCode}的{verifyStudyInfo.VisitName}"
result.ErrorMesseage = _localizer["Study_ImgAlreadyUploaded", verifyStudyInfo.SubjectCode, verifyStudyInfo.VisitName];
}
}
result.StudyInstanceUid = studyInstanceUid;