Merge branch 'develop' into working

This commit is contained in:
Suphonchai Phoonsawat 2025-04-21 17:20:17 +07:00
commit cd54079a47
31 changed files with 27955 additions and 181 deletions

View file

@ -756,7 +756,7 @@ namespace BMA.EHR.Application.Repositories
}
}
public GetUserOCIdDto? GetUserOC(Guid keycloakId, string? accessToken)
public async Task<GetUserOCIdDto?> GetUserOC(Guid keycloakId, string? accessToken)
{
try
{
@ -767,15 +767,11 @@ namespace BMA.EHR.Application.Repositories
var apiResult = GetExternalAPIAsync(apiPath, accessToken ?? "", apiKey);
if (apiResult.Result != null)
{
var raw = JsonConvert.DeserializeObject<GetUserOCIdDto>(apiResult.Result);
var raw = JsonConvert.DeserializeObject<GetUserOCIdResultDto>(apiResult.Result);
return raw;
//if (raw == null || raw.RootId == null)
// return Guid.Empty;
//return raw.RootId;
if (raw != null)
return raw.Result;
}
return null;
}
catch