diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs index c22f411b4..119045a29 100644 --- a/IRaCIS.Core.Application/Service/Management/UserService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserService.cs @@ -521,9 +521,12 @@ namespace IRaCIS.Core.Application.Service } - public async Task GetUserByEmail(string email) + public async Task GetUserByEmail(string email = "") { - + if (email.IsNullOrEmpty() || !email.Contains("@")) + { + return null; + } var user = await _identityUserRepository.Where(t => t.EMail == email).ProjectTo(_mapper.ConfigurationProvider).FirstOrDefaultAsync(); diff --git a/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs b/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs index f906bcb6c..488782087 100644 --- a/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs +++ b/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs @@ -548,6 +548,8 @@ namespace IRaCIS.Application.Contracts public List CalledAEList { get; set; } = new List(); public string? CallingAE { get; set; } + + public string? StudyInstanceUid { get; set; } } diff --git a/IRaCIS.Core.Application/Service/Visit/PatientService.cs b/IRaCIS.Core.Application/Service/Visit/PatientService.cs index 7c45bab42..84ea2012b 100644 --- a/IRaCIS.Core.Application/Service/Visit/PatientService.cs +++ b/IRaCIS.Core.Application/Service/Visit/PatientService.cs @@ -843,6 +843,8 @@ namespace IRaCIS.Application.Services .WhereIf(!string.IsNullOrWhiteSpace(inQuery.PatientIdStr), t => t.Patient.PatientIdStr.Contains(inQuery.PatientIdStr)) .WhereIf(!string.IsNullOrWhiteSpace(inQuery.PatientName), t => t.Patient.PatientName.Contains(inQuery.PatientName)) .WhereIf(!string.IsNullOrWhiteSpace(inQuery.CallingAE), t => t.CallingAE == inQuery.CallingAE) + + .WhereIf(!string.IsNullOrWhiteSpace(inQuery.StudyInstanceUid), t => t.StudyInstanceUid == inQuery.StudyInstanceUid) select new PatientStudySimpleView() { Description = scpStudy.Description,