diff --git a/BMA.EHR.Command.Service/Controllers/OrderController.cs b/BMA.EHR.Command.Service/Controllers/OrderController.cs index d95add63..7388b71a 100644 --- a/BMA.EHR.Command.Service/Controllers/OrderController.cs +++ b/BMA.EHR.Command.Service/Controllers/OrderController.cs @@ -349,13 +349,50 @@ namespace BMA.EHR.Command.Service.Controllers orderBy = data.IssuerOrganizationId, signatoryBy = data.AuthorizedUserFullName, signatoryPosition = data.AuthorizedPosition, - examRound = data.Placement.Id, + examRound = data.Placement == null ? Guid.Empty : data.Placement.Id, registerPosition = "", conclusionRegisterNo = data.ConclusionRegisterNo, conclusionRegisterDate = data.ConclusionRegisterDate, conclusionResultNo = data.ConclusionResultNo, conclusionResultDate = data.ConclusionResultDate, + conclusionMeetingNo = data.ConclusionMeetingNo, + conclusionMeetingDate = data.ConclusionMeetingDate, + + conclusionReturnNo = data.ConclusionReturnNo, + conclusionReturnDate = data.ConclusionReturnDate, + + sourceOrganizationName = data.SourceOrganizationName, + militaryCommandNo = data.MilitaryCommandNo, + militaryCommanDate = data.MilitaryCommanDate, + + placementCommandIssuer = data.PlacementCommandIssuer, + placementCommandNo = data.PlacementCommandNo, + placementCommandDate = data.PlacementCommandDate, + + placementPositionName = data.PlacementPositionName, + placementOrganizationName = data.PlacementOrganizationName, + probationStartDate = data.ProbationStartDate, + probationEndDate = data.ProbationEndDate, + chairManFullName = data.ChairManFullName, + member1FullName = data.Member1FullName, + member2FullName = data.Member2FullName, + + receiveOrganizationName = data.ReceiveOrganizationName, + + transferOrganizationName = data.TransferOrganizationName, + conclusionReceiveNo = data.ConclusionReceiveNo, + conclusionReceiveDate = data.ConclusionReceiveDate, + + govAidCommandNo = data.GovAidCommandNo, + govAidCommandDate = data.GovAidCommandDate, + + fault = data.Fault, + guiltyBasis = data.GuiltyBasis, + conclusionFireNo = data.ConclusionFireNo, + conclusionFireDate = data.ConclusionFireDate, + conclusionFireResolution = data.ConclusionFireResolution, + }; return Success(result); @@ -1446,7 +1483,7 @@ namespace BMA.EHR.Command.Service.Controllers PlacementCommandIssuer = req.placementCommandIssuer, PlacementCommandNo = req.placementCommandNo, PlacementCommandDate = req.placementCommandDate, - + }; var result = await _repository.AddAsync(inserted); @@ -1496,7 +1533,7 @@ namespace BMA.EHR.Command.Service.Controllers order.PlacementCommandIssuer = req.placementCommandIssuer; order.PlacementCommandNo = req.placementCommandNo; - order.PlacementCommandDate = req.placementCommandDate; + order.PlacementCommandDate = req.placementCommandDate; var result = await _repository.UpdateAsync(order); @@ -1609,7 +1646,7 @@ namespace BMA.EHR.Command.Service.Controllers } #endregion - + #region " C-PM-13 " ///