fix หมายเหตุแนวนอน
This commit is contained in:
parent
39acbb7f95
commit
a521eb345d
9 changed files with 399 additions and 358 deletions
|
|
@ -2394,22 +2394,24 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
{
|
||||
result.Add(r);
|
||||
string? _null = null;
|
||||
result.Add(new
|
||||
{
|
||||
No = _null,
|
||||
FullName = r.RemarkHorizontal,
|
||||
CitizenId = _null,
|
||||
PositionName = _null,
|
||||
Organization = _null,
|
||||
PositionLevel = _null,
|
||||
PositionType = _null,
|
||||
PositionNumber = _null,
|
||||
ActiveDate = _null,
|
||||
Salary = _null,
|
||||
Remark = _null,
|
||||
RemarkHorizontal = _null,
|
||||
RemarkVertical = _null,
|
||||
});
|
||||
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
|
||||
result.Add(new
|
||||
{
|
||||
No = _null,
|
||||
FullName = r.RemarkHorizontal,
|
||||
CitizenId = _null,
|
||||
PositionName = _null,
|
||||
Organization = _null,
|
||||
PositionLevel = _null,
|
||||
PositionType = _null,
|
||||
PositionNumber = _null,
|
||||
ActiveDate = _null,
|
||||
Salary = _null,
|
||||
Remark = _null,
|
||||
RemarkHorizontal = _null,
|
||||
RemarkVertical = _null,
|
||||
});
|
||||
}
|
||||
}
|
||||
return Success(result);
|
||||
}
|
||||
|
|
@ -2575,22 +2577,24 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
{
|
||||
result.Add(r);
|
||||
string? _null = null;
|
||||
result.Add(new
|
||||
{
|
||||
No = _null,
|
||||
FullName = r.RemarkHorizontal,
|
||||
CitizenId = _null,
|
||||
PositionName = _null,
|
||||
Organization = _null,
|
||||
PositionLevel = _null,
|
||||
PositionType = _null,
|
||||
PositionNumber = _null,
|
||||
ActiveDate = _null,
|
||||
Salary = _null,
|
||||
Remark = _null,
|
||||
RemarkHorizontal = _null,
|
||||
RemarkVertical = _null,
|
||||
});
|
||||
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
|
||||
result.Add(new
|
||||
{
|
||||
No = _null,
|
||||
FullName = r.RemarkHorizontal,
|
||||
CitizenId = _null,
|
||||
PositionName = _null,
|
||||
Organization = _null,
|
||||
PositionLevel = _null,
|
||||
PositionType = _null,
|
||||
PositionNumber = _null,
|
||||
ActiveDate = _null,
|
||||
Salary = _null,
|
||||
Remark = _null,
|
||||
RemarkHorizontal = _null,
|
||||
RemarkVertical = _null,
|
||||
});
|
||||
}
|
||||
}
|
||||
return Success(result);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue