hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

fix bug and add field of other command type

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-08-25 17:27:25 +07:00
parent 20ef0c5c09
commit 911ef7c4ab
1 changed files with 41 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

45
BMA.EHR.Command.Service/Controllers/OrderController.cs
View file

@ -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 "
/// <summary>