Compare commits
No commits in common. "34686b10cc4de1ce51e14b740ebd465e026a0b5f" and "3d19ee7b043c98e600cb6a5d6d61cb6a1a85bf78" have entirely different histories.
34686b10cc
...
3d19ee7b04
|
|
@ -521,12 +521,9 @@ 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();
|
var user = await _identityUserRepository.Where(t => t.EMail == email).ProjectTo<UserDetailDTO>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -548,8 +548,6 @@ namespace IRaCIS.Application.Contracts
|
||||||
public List<string> CalledAEList { get; set; } = new List<string>();
|
public List<string> CalledAEList { get; set; } = new List<string>();
|
||||||
|
|
||||||
public string? CallingAE { get; set; }
|
public string? CallingAE { get; set; }
|
||||||
|
|
||||||
public string? StudyInstanceUid { get; set; }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -843,8 +843,6 @@ namespace IRaCIS.Application.Services
|
||||||
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.PatientIdStr), t => t.Patient.PatientIdStr.Contains(inQuery.PatientIdStr))
|
.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.PatientName), t => t.Patient.PatientName.Contains(inQuery.PatientName))
|
||||||
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.CallingAE), t => t.CallingAE == inQuery.CallingAE)
|
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.CallingAE), t => t.CallingAE == inQuery.CallingAE)
|
||||||
|
|
||||||
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.StudyInstanceUid), t => t.StudyInstanceUid == inQuery.StudyInstanceUid)
|
|
||||||
select new PatientStudySimpleView()
|
select new PatientStudySimpleView()
|
||||||
{
|
{
|
||||||
Description = scpStudy.Description,
|
Description = scpStudy.Description,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue