Merge branch 'develop' into work

This commit is contained in:
Kittapath 2023-08-05 17:53:42 +07:00
commit e1e3aeff5c

View file

@ -258,15 +258,14 @@ namespace BMA.EHR.Command.Service.Controllers
FiscalYear = d.CommandYear,
OrderDate = d.CommandAffectDate,
OrderByOrganization = d.IssuerOrganizationName,
OrderBy = d.AuthorizedUserFullName,
OrderBy = d.IssuerOrganizationId,
signatoryBy = d.AuthorizedUserFullName,
signatoryPosition = d.AuthorizedPosition,
OrderStatusValue = d.CommandStatusId,
OrderStatusName = d.CommandStatus.Name,
OrderTypeValue = d.CommandTypeId,
OrderTypeName = d.CommandType.Name
}).ToList();
return Success(data);
}
catch