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

修改国际化
continuous-integration/drone/push Build is passing Details

Test_HIR_Net8
hang 2024-12-19 14:42:56 +08:00
parent 88669ccbff
commit 6b385b619a
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/DicomAEViewModel.cs
View File

@ -38,6 +38,8 @@ namespace IRaCIS.Core.Application.ViewModel
public string? Modality { get; set; }
public string? Description { get; set; }
public bool? IsTestOK { get; set; }
}
///<summary> DicomAEAddOrEdit 列表查询参数模型</summary>

7
IRaCIS.Core.Application/Service/Visit/DicomAEService.cs
View File

@ -18,7 +18,7 @@ namespace IRaCIS.Core.Application.Service
/// DicomAEService
/// </summary>
[ApiExplorerSettings(GroupName = "Common")]
public class DicomAEService (IRepository<DicomAE> _dicomAERepository, IMapper _mapper, IUserInfo _userInfo) : BaseService, IDicomAEService
public class DicomAEService (IRepository<DicomAE> _dicomAERepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IDicomAEService
{
@ -30,7 +30,8 @@ namespace IRaCIS.Core.Application.Service
var dicomAEQueryable = _dicomAERepository
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.IP), t => t.IP.Contains(inQuery.IP))
.WhereIf(inQuery.Port != null, t => t.Port == inQuery.Port)
.WhereIf(inQuery.PacsTypeEnum != null, t => t.PacsTypeEnum == inQuery.PacsTypeEnum)
.WhereIf(inQuery.PacsTypeEnum != null, t => t.PacsTypeEnum == inQuery.PacsTypeEnum)
.WhereIf(inQuery.IsTestOK != null, t => t.IsTestOK == inQuery.IsTestOK)
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.CalledAE), t => t.CalledAE.Contains(inQuery.CalledAE))
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.Description), t => t.Description.Contains(inQuery.Description))
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.Modality), t => t.ModalityList.Contains(inQuery.Modality))
@ -52,7 +53,7 @@ namespace IRaCIS.Core.Application.Service
{
VerifyExp = u => u.IP == addOrEditDicomAE.IP && u.Port == addOrEditDicomAE.Port && u.PacsTypeEnum==addOrEditDicomAE.PacsTypeEnum,
VerifyMsg = "不允许添加相同的IP和端口的记录"
VerifyMsg = _localizer["DicomAE_RepeatIPAndPort"] //"不允许添加相同的IP和端口的记录"
};
// 在此处拷贝automapper 映射

2
IRaCIS.Core.Application/Service/Visit/PatientService.cs
View File

@ -3107,7 +3107,7 @@ namespace IRaCIS.Application.Services
{
if(response.Status.State == DicomState.Failure)
{
_logger.LogError($" {response.SOPClassUID.ToJsonNotIgnoreNull()}");
_logger.LogError($" Cmove Pacs 状态返回失败： {response.SOPClassUID.ToJsonNotIgnoreNull()}");
}
};