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

คำสั่งส่งตัวกลับ

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-09-27 12:36:21 +07:00
parent e5f73f42ef
commit c2021691fc
4 changed files with 96 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

38
BMA.EHR.Report.Service/Controllers/CommandReportController.cs
View file

@ -1666,23 +1666,25 @@ namespace BMA.EHR.Report.Service.Controllers
//var recvId = raw_data.Receivers.Select(x => x.RefPlacementProfileId).ToList();
//var positionList = string.Empty;
var command = new
{
CommandNo = raw_data.CommandNo.ToThaiNumber(),
CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(),
IssuerOrganizationName = raw_data.IssuerOrganizationName,
ConclusionRegisterNo = raw_data.ConclusionRegisterNo.ToThaiNumber(),
ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3().ToThaiNumber(),
ConclusionResultNo = raw_data.ConclusionResultNo.ToThaiNumber(),
ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3().ToThaiNumber(),
PositionList = "",
Count = raw_data.Receivers.Count.ToString().ToThaiNumber(),
CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(),
AuthorizedUserFullName = raw_data.AuthorizedUserFullName,
AuthorizedPosition = raw_data.AuthorizedPosition,
GovAidCommandNo = raw_data.GovAidCommandNo.ToThaiNumber(),
GovAidCommandDate = raw_data.GovAidCommandDate == null ? "" : raw_data.GovAidCommandDate.Value.ToThaiFullDate3().ToThaiNumber(),
};
//var command = new
//{
// CommandNo = raw_data.CommandNo.ToThaiNumber(),
// CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(),
// IssuerOrganizationName = raw_data.IssuerOrganizationName,
// ConclusionRegisterNo = raw_data.ConclusionRegisterNo.ToThaiNumber(),
// ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3().ToThaiNumber(),
// ConclusionResultNo = raw_data.ConclusionResultNo.ToThaiNumber(),
// ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3().ToThaiNumber(),
// PositionList = "",
// Count = raw_data.Receivers.Count.ToString().ToThaiNumber(),
// CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(),
// AuthorizedUserFullName = raw_data.AuthorizedUserFullName,
// AuthorizedPosition = raw_data.AuthorizedPosition,
// GovAidCommandNo = raw_data.GovAidCommandNo.ToThaiNumber(),
// GovAidCommandDate = raw_data.GovAidCommandDate == null ? "" : raw_data.GovAidCommandDate.Value.ToThaiFullDate3().ToThaiNumber(),
//};
var data = await _commandReportRepository.GetCommandType16Async(commandId);
var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"30-คำสั่งส่งตัวกลับไปปฏิบัติงานทางต้นสังกัดเดิม.trdp");
@ -1693,7 +1695,7 @@ namespace BMA.EHR.Report.Service.Controllers
report = (Telerik.Reporting.Report)reportPackager.UnpackageDocument(sourceStream);
}
report.DataSource = command;
report.DataSource = data;
System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
if (exportType == "docx")