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:
Kittapath 2024-01-12 09:53:10 +07:00
parent de8532edd3
commit 25bac519ec
1 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,6 +2,7 @@
using BMA.EHR.Domain.Common;
using BMA.EHR.Domain.Extensions;
using BMA.EHR.Domain.Shared;
using iTextSharp.text.pdf;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
@ -1976,6 +1977,14 @@ namespace BMA.EHR.Report.Service.Controllers
Positionno = raw_data_profile == null ? "" : raw_data_profile.Positionno,
Organizationname = raw_data_profile == null ? "" : raw_data_profile.Organizationname,
Salary = raw_data_profile == null ? "" : raw_data_profile.Salary,
OrderDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(),
SignatoryBy = raw_data.AuthorizedUserFullName,
SignatoryPosition = raw_data.AuthorizedPosition,
ConclusionFireNo = raw_data.ConclusionFireNo,
ConclusionFireDate = raw_data.ConclusionFireDate == null ? "" : raw_data.ConclusionFireDate.Value.ToThaiFullDate3().ToThaiNumber(),
ConclusionFireResolution = raw_data.ConclusionFireResolution,
};
return command;
@ -2061,6 +2070,10 @@ namespace BMA.EHR.Report.Service.Controllers
Positionno = raw_data_profile == null ? "" : raw_data_profile.Positionno,
Organizationname = raw_data_profile == null ? "" : raw_data_profile.Organizationname,
Salary = raw_data_profile == null ? "" : raw_data_profile.Salary,
OrderDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(),
SignatoryBy = raw_data.AuthorizedUserFullName,
SignatoryPosition = raw_data.AuthorizedPosition,
};
return command;
@ -2506,6 +2519,12 @@ namespace BMA.EHR.Report.Service.Controllers
Positionno = raw_data_profile == null ? "" : raw_data_profile.Positionno,
Organizationname = raw_data_profile == null ? "" : raw_data_profile.Organizationname,
Salary = raw_data_profile == null ? "" : raw_data_profile.Salary,
OrderDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(),
SignatoryBy = raw_data.AuthorizedUserFullName,
SignatoryPosition = raw_data.AuthorizedPosition,
CreatedAt = raw_data.CreatedAt.ToThaiFullDate3().ToThaiNumber(),
};
return command;