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

แก้รายงาน รองรับด้านแบบ Multi ในบัญชี 1

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-06-07 15:34:06 +07:00
parent aeb61be218
commit 9c24102b62
7 changed files with 78 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Services/OrganizationReportService.cs
View file

@ -1,5 +1,6 @@
using Amazon.Internal;
using BMA.EHR.Extensions;
using BMA.EHR.Organization.Service.Extensions;
using BMA.EHR.Profile.Service.Services;
using BMA.EHR.Report.Service.Data;
using Microsoft.EntityFrameworkCore;
@ -102,10 +103,10 @@ namespace BMA.EHR.Report.Service.Services
ShortName = sn.Name,
PositionNumber = pn.Name,
PositionLevel = _profileService.GetPositionLevel(pm.Id),
PositionName = pp.Name,
PositionSide = pp_pps == null ? "" : $"({pp_pps.Name})",
PositionExecutive = pm_exp == null ? "" : pm_exp.Name,
PositionExecutiveSide = pm_exp_s == null ? "" : $"({pm_exp_s.Name})",
PositionName = $"{pp.Name}\r\n",
PositionSide = pm.PositionPathSideObject is null ? "" : Newtonsoft.Json.JsonConvert.DeserializeObject<List<PositionPathSideObject>>(pm.PositionPathSideObject).GetNameList(),
PositionExecutive = pm_exp == null ? "" : $"{pm_exp.Name}\r\n",
PositionExecutiveSide = pm.PositionExecutiveSideObject is null ? "" : Newtonsoft.Json.JsonConvert.DeserializeObject<List<PositionExecutiveSideObject>>(pm.PositionExecutiveSideObject).GetNameList(),
Remark = op.PositionUserNote,
OcOrder = oc.OrganizationOrder.Value,
PositionType = pt.Name