Merge branch 'develop' into working

This commit is contained in:
Suphonchai Phoonsawat 2024-07-05 16:50:56 +07:00
commit 9d90c98800
8 changed files with 23 additions and 12 deletions

View file

@ -9158,11 +9158,14 @@ namespace BMA.EHR.Application.Repositories.Commands
var raw = JsonConvert.DeserializeObject<dynamic>(apiResult.Result);
if (raw != null)
{
ret.Add(new KeyValueItemResponse
if(raw.result!.rootId != null && raw.result!.root != null)
{
Id = raw.result!.rootId ?? null,
Name = raw.result!.root ?? null,
});
ret.Add(new KeyValueItemResponse
{
Id = raw.result!.rootId ?? null,
Name = raw.result!.root ?? null,
});
}
}
}
// var rootOcId = await GetRootOcIdAsync(UserOrganizationId);