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

Merge branch 'Test_HIR_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_HIR_Net8
continuous-integration/drone/push Build is passing Details

Test_HIR_Net8
he 2025-09-19 14:56:44 +08:00
parent e745271671 34686b10cc
commit db6c0457ae
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IRaCIS.Core.Application/Service/Management/UserService.cs
View File

@ -521,9 +521,12 @@ namespace IRaCIS.Core.Application.Service
}
public async Task<UserDetailDTO?> GetUserByEmail(string email)
public async Task<UserDetailDTO?> GetUserByEmail(string email = "")
{
if (email.IsNullOrEmpty() || !email.Contains("@"))
{
return null;
}
var user = await _identityUserRepository.Where(t => t.EMail == email).ProjectTo<UserDetailDTO>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();

2
IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs
View File

@ -548,6 +548,8 @@ namespace IRaCIS.Application.Contracts
public List<string> CalledAEList { get; set; } = new List<string>();
public string? CallingAE { get; set; }
public string? StudyInstanceUid { get; set; }
}

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

@ -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,