增加查询条件,通过邮件获取用户修改
parent
214ea985d9
commit
711c4c5888
|
|
@ -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();
|
var user = await _identityUserRepository.Where(t => t.EMail == email).ProjectTo<UserDetailDTO>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -548,6 +548,8 @@ 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,6 +843,8 @@ 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