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

fix report

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-05-13 20:13:01 +07:00
parent a15f2a1081
commit d86eb050a8
6 changed files with 64 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

49
Controllers/OrganizationReportController.cs
View file

@ -46,6 +46,19 @@ namespace BMA.EHR.Report.Service.Controllers
#region " Methods "
[HttpGet("oc-type")]
public async Task<ActionResult<ResponseObject>> GetOCType()
{
try
{
return Success(await _organizationReportService.GetOrganizationTypes("หน่วยงาน"));
}
catch (Exception ex)
{
return Error(ex);
}
}
/// <summary>
/// รายงานบัญชี 1
/// </summary>
@ -174,14 +187,15 @@ namespace BMA.EHR.Report.Service.Controllers
OcFullNameNew = d.OcFullNameNew.Replace($"\r\n{d.OcNameNew}", string.Empty),
OcNameNew = d.OcNameNew,
ShortNameNew = d.ShortNameNew,
PositionNumberNew = d.PositionNumberNew,
PositionNumberIntNew = d.PositionNumberNew == "" ? 0 : Convert.ToInt32(d.PositionNumberNew.Split(".").Last()),
PositionLevelNew = d.PositionLevelNew,
PositionNameNew = d.PositionNameNew,
PositionSideNew = d.PositionSideNew,
PositionExecutiveNew = d.PositionExecutiveNew,
PositionExecutiveSideNew = d.PositionExecutiveSideNew,
PositionTypeNew = d.PositionTypeNew,
PositionNumberNew = d.PositionNumberNew == "" ? d.PositionNumber : d.PositionNumberNew,
PositionNumberIntNew = d.PositionNumberNew == "" ? Convert.ToInt32(d.PositionNumber.Split(".").Last()) :
Convert.ToInt32(d.PositionNumberNew.Split(".").Last()),
PositionLevelNew = d.PositionLevelNew == "" ? d.PositionLevel : d.PositionLevelNew,
PositionNameNew = d.PositionNameNew == "" ? d.PositionName : d.PositionNameNew,
PositionSideNew = d.PositionSideNew == "" ? d.PositionSide : d.PositionSideNew,
PositionExecutiveNew = d.PositionExecutiveNew == "" ? d.PositionExecutive : d.PositionExecutiveNew,
PositionExecutiveSideNew = d.PositionExecutiveSideNew == "" ? d.PositionExecutiveSide : d.PositionExecutiveSideNew,
PositionTypeNew = d.PositionTypeNew == "" ? d.PositionType : d.PositionTypeNew,
Prefix = d.Prefix,
FirstName = d.FirstName,
@ -264,7 +278,7 @@ namespace BMA.EHR.Report.Service.Controllers
OcName = d.OcName,
ShortName = d.ShortName,
PositionNumber = d.PositionNumber,
PositionNumberInt =d.PositionNumber == "" ? 0 : Convert.ToInt32(d.PositionNumber.Split(".").Last()),
PositionNumberInt = d.PositionNumber == "" ? 0 : Convert.ToInt32(d.PositionNumber.Split(".").Last()),
PositionName = d.PositionName,
PositionSide = d.PositionSide,
PositionExecutive = d.PositionExecutive,
@ -278,14 +292,15 @@ namespace BMA.EHR.Report.Service.Controllers
OcFullNameNew = d.OcFullNameNew.Replace($"\r\n{d.OcNameNew}", string.Empty),
OcNameNew = d.OcNameNew,
ShortNameNew = d.ShortNameNew,
PositionNumberNew = d.PositionNumberNew,
PositionNumberIntNew = d.PositionNumberNew == "" ? 0 : Convert.ToInt32(d.PositionNumberNew.Split(".").Last()),
PositionLevelNew = d.PositionLevelNew,
PositionNameNew = d.PositionNameNew,
PositionSideNew = d.PositionSideNew,
PositionExecutiveNew = d.PositionExecutiveNew,
PositionExecutiveSideNew = d.PositionExecutiveSideNew,
PositionTypeNew = d.PositionTypeNew,
PositionNumberNew = d.PositionNumberNew == "" ? d.PositionNumber : d.PositionNumberNew,
PositionNumberIntNew = d.PositionNumberNew == "" ? Convert.ToInt32(d.PositionNumber.Split(".").Last()) :
Convert.ToInt32(d.PositionNumberNew.Split(".").Last()),
PositionLevelNew = d.PositionLevelNew == "" ? d.PositionLevel : d.PositionLevelNew,
PositionNameNew = d.PositionNameNew == "" ? d.PositionName : d.PositionNameNew,
PositionSideNew = d.PositionSideNew == "" ? d.PositionSide : d.PositionSideNew,
PositionExecutiveNew = d.PositionExecutiveNew == "" ? d.PositionExecutive : d.PositionExecutiveNew,
PositionExecutiveSideNew = d.PositionExecutiveSideNew == "" ? d.PositionExecutiveSide : d.PositionExecutiveSideNew,
PositionTypeNew = d.PositionTypeNew == "" ? d.PositionType : d.PositionTypeNew,
Prefix = d.Prefix,
FirstName = d.FirstName,