diff --git a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
index 382726ec..26f85397 100644
--- a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
+++ b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
@@ -272,7 +272,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                         PositionEmployeeLevelId = placementProfile.PositionLevel!.Id,
                         PositionLineId = placementProfile.PositionLine == null ? Guid.Empty : placementProfile.PositionLine.Id,
                         PositionLine = placementProfile.PositionLine == null ? "" : placementProfile.PositionLine.Name,
-                        PosNo = placementProfile.OrganizationPosition!.PositionNumber,                   
+                        PosNo = placementProfile.OrganizationPosition!.PositionNumber,
 
                         IsVerified = true,
                         IsProbation = true,
@@ -553,7 +553,8 @@ namespace BMA.EHR.Application.Repositories.Commands
             // attatch
             _dbContext.Attatch(entity.CommandStatus);
             _dbContext.Attatch(entity.CommandType);
-            _dbContext.Attatch(entity.Placement);
+            if (entity.Placement != null)
+                _dbContext.Attatch(entity.Placement);
 
             return await base.UpdateAsync(entity);
         }
diff --git a/BMA.EHR.Command.Service/Controllers/OrderController.cs b/BMA.EHR.Command.Service/Controllers/OrderController.cs
index e77d2419..c34bb266 100644
--- a/BMA.EHR.Command.Service/Controllers/OrderController.cs
+++ b/BMA.EHR.Command.Service/Controllers/OrderController.cs
@@ -341,6 +341,7 @@ namespace BMA.EHR.Command.Service.Controllers
                 {
                     orderId = orderId,
                     orderTypeValue = data.CommandTypeId,
+                    orderTypeCode = data.CommandType.CommandCode.ToLower(),
                     orderTitle = data.CommandSubject,
                     orderNo = data.CommandNo,
                     orderYear = data.CommandYear,
@@ -354,6 +355,7 @@ namespace BMA.EHR.Command.Service.Controllers
                     conclusionRegisterDate = data.ConclusionRegisterDate,
                     conclusionResultNo = data.ConclusionResultNo,
                     conclusionResultDate = data.ConclusionResultDate,
+
                 };
 
                 return Success(result);