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-10-21 14:34:02 +07:00
commit 835b0ce337
12 changed files with 31 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -799,6 +799,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
select new select new
{ {
profileId = p.PersonId, profileId = p.PersonId,
commandId = r.commandId,
date = r.commandAffectDate, date = r.commandAffectDate,
refCommandNo = $"{r.commandNo}/{r.commandYear}", refCommandNo = $"{r.commandNo}/{r.commandYear}",
salaryRef = r.templateDoc, salaryRef = r.templateDoc,
@ -891,6 +892,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
select new select new
{ {
profileId = p.PersonId, profileId = p.PersonId,
commandId = r.commandId,
date = r.commandAffectDate, date = r.commandAffectDate,
refCommandNo = $"{r.commandNo}/{r.commandYear}", refCommandNo = $"{r.commandNo}/{r.commandYear}",
salaryRef = r.templateDoc, salaryRef = r.templateDoc,
@ -1041,6 +1043,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
select new select new
{ {
profileId = p.PersonId, profileId = p.PersonId,
commandId = r.commandId,
date = r.commandAffectDate, date = r.commandAffectDate,
refCommandNo = $"{r.commandNo}/{r.commandYear}", refCommandNo = $"{r.commandNo}/{r.commandYear}",
salaryRef = r.templateDoc, salaryRef = r.templateDoc,
@ -1149,6 +1152,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
select new select new
{ {
profileId = p.PersonId, profileId = p.PersonId,
commandId = r.commandId,
date = r.commandAffectDate, date = r.commandAffectDate,
refCommandNo = $"{r.commandNo}/{r.commandYear}", refCommandNo = $"{r.commandNo}/{r.commandYear}",
salaryRef = r.templateDoc, salaryRef = r.templateDoc,
@ -1256,6 +1260,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
select new select new
{ {
profileId = p.PersonId, profileId = p.PersonId,
commandId = r.commandId,
date = r.commandAffectDate, date = r.commandAffectDate,
refCommandNo = $"{r.commandNo}/{r.commandYear}", refCommandNo = $"{r.commandNo}/{r.commandYear}",
salaryRef = r.templateDoc, salaryRef = r.templateDoc,
@ -1363,6 +1368,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
select new select new
{ {
profileId = p.PersonId, profileId = p.PersonId,
commandId = r.commandId,
date = r.commandAffectDate, date = r.commandAffectDate,
refCommandNo = $"{r.commandNo}/{r.commandYear}", refCommandNo = $"{r.commandNo}/{r.commandYear}",
salaryRef = r.templateDoc, salaryRef = r.templateDoc,
@ -1470,6 +1476,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
select new select new
{ {
profileId = p.PersonId, profileId = p.PersonId,
commandId = r.commandId,
date = r.commandAffectDate, date = r.commandAffectDate,
refCommandNo = $"{r.commandNo}/{r.commandYear}", refCommandNo = $"{r.commandNo}/{r.commandYear}",
salaryRef = r.templateDoc, salaryRef = r.templateDoc,
@ -1577,6 +1584,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
select new select new
{ {
profileId = p.PersonId, profileId = p.PersonId,
commandId = r.commandId,
date = r.commandAffectDate, date = r.commandAffectDate,
refCommandNo = $"{r.commandNo}/{r.commandYear}", refCommandNo = $"{r.commandNo}/{r.commandYear}",
salaryRef = r.templateDoc, salaryRef = r.templateDoc,
@ -1684,6 +1692,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
select new select new
{ {
profileId = p.PersonId, profileId = p.PersonId,
commandId = r.commandId,
date = r.commandAffectDate, date = r.commandAffectDate,
refCommandNo = $"{r.commandNo}/{r.commandYear}", refCommandNo = $"{r.commandNo}/{r.commandYear}",
salaryRef = r.templateDoc, salaryRef = r.templateDoc,
@ -1807,6 +1816,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
select new select new
{ {
profileId = p.PersonId, profileId = p.PersonId,
commandId = r.commandId,
date = r.commandAffectDate, date = r.commandAffectDate,
refCommandNo = $"{r.commandNo}/{r.commandYear}", refCommandNo = $"{r.commandNo}/{r.commandYear}",
salaryRef = r.templateDoc, salaryRef = r.templateDoc,

1
BMA.EHR.Discipline.Service/Requests/ReportExecuteRequest.cs
View file

@ -12,6 +12,7 @@ namespace BMA.EHR.Discipline.Service.Requests
public string? refId { get; set; } public string? refId { get; set; }
public DateTime commandAffectDate { get; set; } public DateTime commandAffectDate { get; set; }
public string? commandNo { get; set; } public string? commandNo { get; set; }
public string? commandId { get; set; }
public int commandYear { get; set; } public int commandYear { get; set; }
public string? templateDoc { get; set; } public string? templateDoc { get; set; }
public double? amount { get; set; } public double? amount { get; set; }

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

@ -863,6 +863,7 @@ namespace BMA.EHR.Placement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.posMasterNo == null ? "" : posNo = p.posMasterNo == null ? "" :
@ -1021,6 +1022,7 @@ namespace BMA.EHR.Placement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.posMasterNo == null ? "" : posNo = p.posMasterNo == null ? "" :
@ -1177,6 +1179,7 @@ namespace BMA.EHR.Placement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.posMasterNo == null ? "" : posNo = p.posMasterNo == null ? "" :
@ -1328,6 +1331,7 @@ namespace BMA.EHR.Placement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.posMasterNo == null ? "" : posNo = p.posMasterNo == null ? "" :
@ -1490,6 +1494,7 @@ namespace BMA.EHR.Placement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.posMasterNo == null ? "" : posNo = p.posMasterNo == null ? "" :

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

@ -1943,6 +1943,7 @@ namespace BMA.EHR.Placement.Service.Controllers
profileId = string.Empty, profileId = string.Empty,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.posMasterNo == null ? "" : posNo = p.posMasterNo == null ? "" :
@ -2127,6 +2128,7 @@ namespace BMA.EHR.Placement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.posMasterNo == null ? "" : posNo = p.posMasterNo == null ? "" :
@ -2298,6 +2300,7 @@ namespace BMA.EHR.Placement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.posMasterNo == null ? "" : posNo = p.posMasterNo == null ? "" :
@ -2463,6 +2466,7 @@ namespace BMA.EHR.Placement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.posMasterNo == null ? "" : posNo = p.posMasterNo == null ? "" :

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

@ -676,6 +676,7 @@ namespace BMA.EHR.Placement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.PositionNumberOld, posNo = p.PositionNumberOld,

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

@ -1039,6 +1039,7 @@ namespace BMA.EHR.Placement.Service.Controllers
profileId = string.Empty, profileId = string.Empty,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.posMasterNo == null ? "" : posNo = p.posMasterNo == null ? "" :

1
BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs
View file

@ -537,6 +537,7 @@ namespace BMA.EHR.Placement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.PositionNumberOld, posNo = p.PositionNumberOld,

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

@ -882,6 +882,7 @@ namespace BMA.EHR.Placement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.PositionNumberOld, posNo = p.PositionNumberOld,

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

@ -740,6 +740,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.PositionNumberOld, posNo = p.PositionNumberOld,
@ -891,6 +892,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.PositionNumberOld, posNo = p.PositionNumberOld,

1
BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
View file

@ -528,6 +528,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.PositionNumberOld, posNo = p.PositionNumberOld,

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

@ -1762,6 +1762,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.PositionNumberOld, posNo = p.PositionNumberOld,
@ -1859,6 +1860,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.PositionNumberOld, posNo = p.PositionNumberOld,
@ -2001,6 +2003,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.PositionNumberOld, posNo = p.PositionNumberOld,

1
BMA.EHR.Retirement.Service/Requests/ReportExecuteRequest.cs
View file

@ -12,6 +12,7 @@ namespace BMA.EHR.Retirement.Service.Requests
public string? refId { get; set; } public string? refId { get; set; }
public DateTime commandAffectDate { get; set; } public DateTime commandAffectDate { get; set; }
public string? commandNo { get; set; } public string? commandNo { get; set; }
public string? commandId { get; set; }
public int commandYear { get; set; } public int commandYear { get; set; }
public string? templateDoc { get; set; } public string? templateDoc { get; set; }
public double? amount { get; set; } public double? amount { get; set; }