เพิ่ม api ผลตรวจเลือด
This commit is contained in:
Kittapath
parent
060765d373
commit
4a17aef039
18 changed files with 27329 additions and 562 deletions
|
|
@ -71,11 +71,20 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : p.Profile.PositionEmployeePosition,
|
||||
posNo = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PosNo == null ? null : p.Profile.PosNo.Name) : p.Profile.PosNoEmployee,
|
||||
positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : p.Profile.PositionEmployeeLevel,
|
||||
salary = 10000,
|
||||
// salary = p.Profile.Salaries.Count() == 0 ? null : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().PositionSalaryAmount,
|
||||
p.CreatedAt,
|
||||
p.Organization,
|
||||
p.Reason,
|
||||
p.Status,
|
||||
p.Date,
|
||||
salary = p.AmountOld,
|
||||
PositionTypeOld = p.PositionTypeOld == null ? null : p.PositionTypeOld.Name,
|
||||
PositionLevelOld = p.PositionLevelOld == null ? null : p.PositionLevelOld.Name,
|
||||
PositionNumberOld = p.PositionNumberOld == null ? null : p.PositionNumberOld.Name,
|
||||
PositionTypeOldId = p.PositionTypeOld == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionTypeOld.Id,
|
||||
PositionLevelOldId = p.PositionLevelOld == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionLevelOld.Id,
|
||||
PositionNumberOldId = p.PositionNumberOld == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionNumberOld.Id,
|
||||
OrganizationPositionOldId = p.OrganizationPositionOld == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OrganizationPositionOld.Id,
|
||||
p.IsActive,
|
||||
})
|
||||
.ToListAsync();
|
||||
|
|
@ -103,11 +112,20 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : p.Profile.PositionEmployeePosition,
|
||||
posNo = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PosNo == null ? null : p.Profile.PosNo.Name) : p.Profile.PosNoEmployee,
|
||||
positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : p.Profile.PositionEmployeeLevel,
|
||||
salary = 10000,
|
||||
// salary = p.Profile.Salaries.Count() == 0 ? null : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().PositionSalaryAmount,
|
||||
p.CreatedAt,
|
||||
p.Organization,
|
||||
p.Reason,
|
||||
p.Status,
|
||||
p.Date,
|
||||
salary = p.AmountOld,
|
||||
PositionTypeOld = p.PositionTypeOld == null ? null : p.PositionTypeOld.Name,
|
||||
PositionLevelOld = p.PositionLevelOld == null ? null : p.PositionLevelOld.Name,
|
||||
PositionNumberOld = p.PositionNumberOld == null ? null : p.PositionNumberOld.Name,
|
||||
PositionTypeOldId = p.PositionTypeOld == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionTypeOld.Id,
|
||||
PositionLevelOldId = p.PositionLevelOld == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionLevelOld.Id,
|
||||
PositionNumberOldId = p.PositionNumberOld == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionNumberOld.Id,
|
||||
OrganizationPositionOldId = p.OrganizationPositionOld == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OrganizationPositionOld.Id,
|
||||
p.IsActive,
|
||||
})
|
||||
.ToListAsync();
|
||||
|
|
@ -134,15 +152,24 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
.Where(x => x.Profile != null)
|
||||
.Select(p => new
|
||||
{
|
||||
Id = p.Id,
|
||||
p.Id,
|
||||
position = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.Position == null ? null : p.Profile.Position.Name) : p.Profile.PositionEmployeePosition,
|
||||
posNo = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PosNo == null ? null : p.Profile.PosNo.Name) : p.Profile.PosNoEmployee,
|
||||
positionLevel = p.Profile.ProfileType.Trim().ToUpper().Contains("OFFICER") ? (p.Profile.PositionLevel == null ? null : p.Profile.PositionLevel.Name) : p.Profile.PositionEmployeeLevel,
|
||||
organizationOrganization = p.Profile.OrganizationOrganization,
|
||||
Reason = p.Reason,
|
||||
Status = p.Status,
|
||||
Organization = p.Organization,
|
||||
CreatedAt = p.CreatedAt,
|
||||
p.Reason,
|
||||
p.Status,
|
||||
p.Organization,
|
||||
p.Date,
|
||||
salary = p.AmountOld,
|
||||
p.CreatedAt,
|
||||
PositionTypeOld = p.PositionTypeOld == null ? null : p.PositionTypeOld.Name,
|
||||
PositionLevelOld = p.PositionLevelOld == null ? null : p.PositionLevelOld.Name,
|
||||
PositionNumberOld = p.PositionNumberOld == null ? null : p.PositionNumberOld.Name,
|
||||
PositionTypeOldId = p.PositionTypeOld == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionTypeOld.Id,
|
||||
PositionLevelOldId = p.PositionLevelOld == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionLevelOld.Id,
|
||||
PositionNumberOldId = p.PositionNumberOld == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PositionNumberOld.Id,
|
||||
OrganizationPositionOldId = p.OrganizationPositionOld == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.OrganizationPositionOld.Id,
|
||||
PlacementTransferDocs = p.PlacementTransferDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
|
||||
})
|
||||
.FirstOrDefaultAsync();
|
||||
|
|
@ -166,6 +193,15 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
Status = data.Status,
|
||||
Organization = data.Organization,
|
||||
CreatedAt = data.CreatedAt,
|
||||
Date = data.Date,
|
||||
salary = data.salary,
|
||||
PositionTypeOld = data.PositionTypeOld,
|
||||
PositionLevelOld = data.PositionLevelOld,
|
||||
PositionNumberOld = data.PositionNumberOld,
|
||||
PositionTypeOldId = data.PositionTypeOldId,
|
||||
PositionLevelOldId = data.PositionLevelOldId,
|
||||
PositionNumberOldId = data.PositionNumberOldId,
|
||||
OrganizationPositionOldId = data.OrganizationPositionOldId,
|
||||
Docs = placementTransferDocs,
|
||||
};
|
||||
|
||||
|
|
@ -184,6 +220,10 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
public async Task<ActionResult<ResponseObject>> Post([FromForm] PlacementTransferRequest req)
|
||||
{
|
||||
var profile = await _context.Profiles
|
||||
.Include(x => x.PositionLevel)
|
||||
.Include(x => x.PositionType)
|
||||
.Include(x => x.PosNo)
|
||||
.Include(x => x.Salaries)
|
||||
.FirstOrDefaultAsync(x => x.KeycloakId == Guid.Parse(UserId));
|
||||
if (profile == null)
|
||||
return Error(GlobalMessages.DataNotFound, 404);
|
||||
|
|
@ -193,6 +233,12 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
Profile = profile,
|
||||
Organization = Request.Form.ContainsKey("Organization") ? Request.Form["Organization"] : "",
|
||||
Reason = Request.Form.ContainsKey("Reason") ? Request.Form["Reason"] : "",
|
||||
Date = req.Date,
|
||||
AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().PositionSalaryAmount,
|
||||
PositionLevelOld = profile.PositionLevel,
|
||||
PositionTypeOld = profile.PositionType,
|
||||
PositionNumberOld = profile.PosNo,
|
||||
OrganizationPositionOld = await _context.OrganizationPositions.FirstOrDefaultAsync(x => x.PositionNumber == profile.PosNo),
|
||||
Status = "PENDING",
|
||||
CreatedUserId = FullName ?? "",
|
||||
CreatedFullName = UserId ?? "System Administrator",
|
||||
|
|
@ -235,6 +281,61 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
return Success();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// แก้ไขคำขอโอน
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
/// <response code="200"></response>
|
||||
/// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
|
||||
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
|
||||
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
|
||||
[HttpPut("{id:length(36)}")]
|
||||
public async Task<ActionResult<ResponseObject>> Put([FromBody] PlacementTransferEditRequest req, Guid id)
|
||||
{
|
||||
var uppdated = await _context.PlacementTransfers
|
||||
.FirstOrDefaultAsync(x => x.Id == id);
|
||||
if (uppdated == null)
|
||||
return Error(GlobalMessages.PlacementTransferNotFound, 404);
|
||||
|
||||
if (req.PosNoOld != null)
|
||||
{
|
||||
var save_posNo = await _context.PositionNumbers.FindAsync(req.PosNoOld);
|
||||
if (save_posNo == null)
|
||||
return Error(GlobalMessages.PositionPosNoNotFound, 404);
|
||||
uppdated.PositionNumberOld = save_posNo;
|
||||
|
||||
var save_orgPosition = await _context.OrganizationPositions.FirstOrDefaultAsync(x => x.PositionNumber == save_posNo);
|
||||
if (save_orgPosition == null)
|
||||
return Error(GlobalMessages.PositionPosNoNotFound, 404);
|
||||
uppdated.OrganizationPositionOld = save_orgPosition;
|
||||
}
|
||||
if (req.PositionLevelOld != null)
|
||||
{
|
||||
var save = await _context.PositionLevels.FindAsync(req.PositionLevelOld);
|
||||
if (save == null)
|
||||
return Error(GlobalMessages.PositionLevelNotFound, 404);
|
||||
uppdated.PositionLevelOld = save;
|
||||
}
|
||||
if (req.PositionTypeOld != null)
|
||||
{
|
||||
var save = await _context.PositionTypes.FindAsync(req.PositionTypeOld);
|
||||
if (save == null)
|
||||
return Error(GlobalMessages.PositionTypeNotFound, 404);
|
||||
uppdated.PositionTypeOld = save;
|
||||
}
|
||||
|
||||
uppdated.AmountOld = req.AmountOld;
|
||||
uppdated.Organization = req.Organization;
|
||||
uppdated.Reason = req.Reason;
|
||||
uppdated.Date = req.Date;
|
||||
uppdated.LastUpdateFullName = FullName ?? "System Administrator";
|
||||
uppdated.LastUpdateUserId = UserId ?? "";
|
||||
uppdated.LastUpdatedAt = DateTime.Now;
|
||||
await _context.SaveChangesAsync();
|
||||
|
||||
return Success();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// อนุมัติคำขอโอน
|
||||
/// </summary>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue