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

Merge branch 'develop' of github.com:Frappet/BMA-EHR-BackEnd into develop

Browse source
This commit is contained in:
kittapath 2024-12-25 22:57:30 +07:00
commit 6740dd5f1d
9 changed files with 399 additions and 358 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
View file

@ -1039,6 +1039,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new { result.Add(new {
fullName = _null, fullName = _null,
positionname = r.RemarkHorizontal, positionname = r.RemarkHorizontal,
@ -1047,6 +1048,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
salary = _null, salary = _null,
}); });
} }
}
return Success(result); return Success(result);
} }
catch catch

10
BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
View file

@ -844,6 +844,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new result.Add(new
{ {
No = _null, No = _null,
@ -866,6 +867,7 @@ namespace BMA.EHR.Placement.Service.Controllers
RemarkVertical = _null, RemarkVertical = _null,
}); });
} }
}
return Success(result); return Success(result);
} }
catch catch
@ -1054,6 +1056,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new result.Add(new
{ {
No = _null, No = _null,
@ -1076,6 +1079,7 @@ namespace BMA.EHR.Placement.Service.Controllers
RemarkVertical = _null, RemarkVertical = _null,
}); });
} }
}
return Success(result); return Success(result);
} }
catch catch
@ -1261,6 +1265,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new result.Add(new
{ {
No = _null, No = _null,
@ -1277,6 +1282,7 @@ namespace BMA.EHR.Placement.Service.Controllers
RemarkVertical = _null, RemarkVertical = _null,
}); });
} }
}
return Success(result); return Success(result);
} }
catch catch
@ -1464,6 +1470,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new result.Add(new
{ {
No = _null, No = _null,
@ -1480,6 +1487,7 @@ namespace BMA.EHR.Placement.Service.Controllers
RemarkVertical = _null, RemarkVertical = _null,
}); });
} }
}
return Success(result); return Success(result);
} }
catch catch
@ -1678,6 +1686,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new result.Add(new
{ {
No = _null, No = _null,
@ -1699,6 +1708,7 @@ namespace BMA.EHR.Placement.Service.Controllers
RemarkVertical = _null, RemarkVertical = _null,
}); });
} }
}
return Success(result); return Success(result);
} }
catch catch

11
BMA.EHR.Placement.Service/Controllers/PlacementController.cs
View file

@ -1623,6 +1623,8 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
result.Add(new result.Add(new
{ {
No = _null, No = _null,
@ -1645,6 +1647,7 @@ namespace BMA.EHR.Placement.Service.Controllers
RemarkVertical = _null, RemarkVertical = _null,
}); });
} }
}
return Success(result); return Success(result);
} }
catch catch
@ -1927,6 +1930,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new result.Add(new
{ {
No = _null, No = _null,
@ -1948,6 +1952,7 @@ namespace BMA.EHR.Placement.Service.Controllers
RemarkVertical = _null, RemarkVertical = _null,
}); });
} }
}
return Success(result); return Success(result);
} }
catch catch
@ -2250,6 +2255,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new result.Add(new
{ {
No = _null, No = _null,
@ -2273,6 +2279,7 @@ namespace BMA.EHR.Placement.Service.Controllers
RemarkVertical = _null, RemarkVertical = _null,
}); });
} }
}
return Success(result); return Success(result);
} }
catch catch
@ -2476,6 +2483,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new result.Add(new
{ {
No = _null, No = _null,
@ -2499,6 +2507,7 @@ namespace BMA.EHR.Placement.Service.Controllers
RemarkVertical = _null, RemarkVertical = _null,
}); });
} }
}
return Success(result); return Success(result);
} }
catch catch
@ -2693,6 +2702,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new result.Add(new
{ {
No = _null, No = _null,
@ -2714,6 +2724,7 @@ namespace BMA.EHR.Placement.Service.Controllers
RemarkVertical = _null, RemarkVertical = _null,
}); });
} }
}
return Success(result); return Success(result);
} }
catch catch

2
BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
View file

@ -628,6 +628,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new result.Add(new
{ {
No = _null, No = _null,
@ -641,6 +642,7 @@ namespace BMA.EHR.Placement.Service.Controllers
RemarkVertical = _null, RemarkVertical = _null,
}); });
} }
}
return Success(result); return Success(result);
} }
catch catch

2
BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
View file

@ -974,6 +974,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new result.Add(new
{ {
No = _null, No = _null,
@ -995,6 +996,7 @@ namespace BMA.EHR.Placement.Service.Controllers
RemarkVertical = _null, RemarkVertical = _null,
}); });
} }
}
return Success(result); return Success(result);
} }
catch catch

2
BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
View file

@ -838,6 +838,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new result.Add(new
{ {
No = _null, No = _null,
@ -855,6 +856,7 @@ namespace BMA.EHR.Placement.Service.Controllers
RemarkVertical = _null, RemarkVertical = _null,
}); });
} }
}
return Success(result); return Success(result);
} }
catch catch

4
BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
View file

@ -721,6 +721,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new result.Add(new
{ {
No = _null, No = _null,
@ -743,6 +744,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
RemarkVertical = _null, RemarkVertical = _null,
}); });
} }
}
return Success(result); return Success(result);
} }
catch catch
@ -925,6 +927,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new result.Add(new
{ {
No = _null, No = _null,
@ -948,6 +951,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
RemarkVertical = _null, RemarkVertical = _null,
}); });
} }
}
return Success(result); return Success(result);
} }
catch catch

4
BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
View file

@ -2394,6 +2394,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new result.Add(new
{ {
No = _null, No = _null,
@ -2411,6 +2412,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
RemarkVertical = _null, RemarkVertical = _null,
}); });
} }
}
return Success(result); return Success(result);
} }
catch catch
@ -2575,6 +2577,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new result.Add(new
{ {
No = _null, No = _null,
@ -2592,6 +2595,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
RemarkVertical = _null, RemarkVertical = _null,
}); });
} }
}
return Success(result); return Success(result);
} }
catch catch

4
BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
View file

@ -2337,6 +2337,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new result.Add(new
{ {
No = _null, No = _null,
@ -2354,6 +2355,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
RemarkVertical = _null, RemarkVertical = _null,
}); });
} }
}
return Success(result); return Success(result);
} }
catch catch
@ -2518,6 +2520,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
{ {
result.Add(r); result.Add(r);
string? _null = null; string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new result.Add(new
{ {
No = _null, No = _null,
@ -2535,6 +2538,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
RemarkVertical = _null, RemarkVertical = _null,
}); });
} }
}
return Success(result); return Success(result);
} }
catch catch