diff --git a/Report/Organization/rptAccount3.trdp b/Report/Organization/rptAccount3.trdp index d3c8c66..f180a4c 100644 Binary files a/Report/Organization/rptAccount3.trdp and b/Report/Organization/rptAccount3.trdp differ diff --git a/Services/OrganizationReportService.cs b/Services/OrganizationReportService.cs index f92b295..838def5 100644 --- a/Services/OrganizationReportService.cs +++ b/Services/OrganizationReportService.cs @@ -254,10 +254,10 @@ namespace BMA.EHR.Report.Service.Services PositionNumber = pn.Name, PositionLevel = rp2_dt == null ? _profileService.GetPositionLevel(pm.Id) : rp2_dt.PositionLevel, - 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>(pm.PositionPathSideObject).GetNameList(), + PositionExecutive = pm_exp == null ? "" : $"{pm_exp.Name}\r\n", + PositionExecutiveSide = pm.PositionExecutiveSideObject is null ? "" : Newtonsoft.Json.JsonConvert.DeserializeObject>(pm.PositionExecutiveSideObject).GetNameList(), Remark = op.PositionUserNote, OcOrder = oc.OrganizationOrder.Value, PositionType = pt.Name, @@ -418,8 +418,6 @@ namespace BMA.EHR.Report.Service.Services } - - public class OrganizationItem { public Guid Id { get; set; }