diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/DicomAEViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/DicomAEViewModel.cs
index cab9b5992..c03184f6c 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/DicomAEViewModel.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/DicomAEViewModel.cs
@@ -38,6 +38,8 @@ namespace IRaCIS.Core.Application.ViewModel
public string? Modality { get; set; }
public string? Description { get; set; }
+
+ public bool? IsTestOK { get; set; }
}
/// DicomAEAddOrEdit 列表查询参数模型
diff --git a/IRaCIS.Core.Application/Service/Visit/DicomAEService.cs b/IRaCIS.Core.Application/Service/Visit/DicomAEService.cs
index cda8f5ebf..11f748843 100644
--- a/IRaCIS.Core.Application/Service/Visit/DicomAEService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/DicomAEService.cs
@@ -18,7 +18,7 @@ namespace IRaCIS.Core.Application.Service
/// DicomAEService
///
[ApiExplorerSettings(GroupName = "Common")]
- public class DicomAEService (IRepository _dicomAERepository, IMapper _mapper, IUserInfo _userInfo) : BaseService, IDicomAEService
+ public class DicomAEService (IRepository _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 映射
diff --git a/IRaCIS.Core.Application/Service/Visit/PatientService.cs b/IRaCIS.Core.Application/Service/Visit/PatientService.cs
index fc871bb30..10e5446c5 100644
--- a/IRaCIS.Core.Application/Service/Visit/PatientService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/PatientService.cs
@@ -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()}");
}
};