แก้วินัยผูก profile ใหม่
This commit is contained in:
Kittapath
parent
afe16503ee
commit
b7f19d7077
36 changed files with 40179 additions and 978 deletions
|
|
@ -612,21 +612,21 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
.FirstOrDefaultAsync(x => x.Id == id);
|
||||
if (deleted == null)
|
||||
return NotFound();
|
||||
// var placementAppointmentDocs = new List<dynamic>();
|
||||
// foreach (var doc in deleted.PlacementAppointmentDocs)
|
||||
// {
|
||||
// if (doc.Document != null)
|
||||
// placementAppointmentDocs.Add(doc.Document.Id);
|
||||
// }
|
||||
var placementAppointmentDocs = new List<dynamic>();
|
||||
foreach (var doc in deleted.PlacementAppointmentDocs)
|
||||
{
|
||||
if (doc.Document != null)
|
||||
placementAppointmentDocs.Add(doc.Document.Id);
|
||||
}
|
||||
_context.PlacementAppointmentDocs.RemoveRange(deleted.PlacementAppointmentDocs);
|
||||
await _context.SaveChangesAsync();
|
||||
// _context.PlacementAppointments.Remove(deleted);
|
||||
// foreach (var doc in placementAppointmentDocs)
|
||||
// {
|
||||
// if (doc != null)
|
||||
// await _documentService.DeleteFileAsync(doc);
|
||||
// }
|
||||
// await _context.SaveChangesAsync();
|
||||
_context.PlacementAppointments.Remove(deleted);
|
||||
foreach (var doc in placementAppointmentDocs)
|
||||
{
|
||||
if (doc != null)
|
||||
await _documentService.DeleteFileAsync(doc);
|
||||
}
|
||||
await _context.SaveChangesAsync();
|
||||
|
||||
return Success();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -598,21 +598,21 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
.FirstOrDefaultAsync(x => x.Id == id);
|
||||
if (deleted == null)
|
||||
return NotFound();
|
||||
// var placementAppointmentDocs = new List<dynamic>();
|
||||
// foreach (var doc in deleted.PlacementAppointmentDocs)
|
||||
// {
|
||||
// if (doc.Document != null)
|
||||
// placementAppointmentDocs.Add(doc.Document.Id);
|
||||
// }
|
||||
var placementAppointmentDocs = new List<dynamic>();
|
||||
foreach (var doc in deleted.PlacementAppointmentDocs)
|
||||
{
|
||||
if (doc.Document != null)
|
||||
placementAppointmentDocs.Add(doc.Document.Id);
|
||||
}
|
||||
_context.PlacementAppointmentDocs.RemoveRange(deleted.PlacementAppointmentDocs);
|
||||
await _context.SaveChangesAsync();
|
||||
// _context.PlacementAppointments.Remove(deleted);
|
||||
// foreach (var doc in placementAppointmentDocs)
|
||||
// {
|
||||
// if (doc != null)
|
||||
// await _documentService.DeleteFileAsync(doc);
|
||||
// }
|
||||
// await _context.SaveChangesAsync();
|
||||
_context.PlacementAppointments.Remove(deleted);
|
||||
foreach (var doc in placementAppointmentDocs)
|
||||
{
|
||||
if (doc != null)
|
||||
await _documentService.DeleteFileAsync(doc);
|
||||
}
|
||||
await _context.SaveChangesAsync();
|
||||
|
||||
return Success();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -92,27 +92,34 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
|
||||
var placementOfficers = await _context.PlacementOfficers.AsQueryable()
|
||||
.OrderByDescending(x => x.CreatedAt)
|
||||
.Where(x => PlacementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))))
|
||||
.Where(x => PlacementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id))))))
|
||||
.Select(p => new
|
||||
{
|
||||
p.Id,
|
||||
p.prefix,
|
||||
p.firstName,
|
||||
p.lastName,
|
||||
p.root,
|
||||
p.rootShortName,
|
||||
p.child1,
|
||||
p.child1ShortName,
|
||||
p.child2,
|
||||
p.child2ShortName,
|
||||
p.child3,
|
||||
p.child3ShortName,
|
||||
p.child4,
|
||||
p.child4ShortName,
|
||||
p.posMasterNo,
|
||||
p.position,
|
||||
p.posLevelName,
|
||||
p.posTypeName,
|
||||
p.rootOld,
|
||||
p.rootOldId,
|
||||
p.rootShortNameOld,
|
||||
p.child1Old,
|
||||
p.child1OldId,
|
||||
p.child1ShortNameOld,
|
||||
p.child2Old,
|
||||
p.child2OldId,
|
||||
p.child2ShortNameOld,
|
||||
p.child3Old,
|
||||
p.child3OldId,
|
||||
p.child3ShortNameOld,
|
||||
p.child4Old,
|
||||
p.child4OldId,
|
||||
p.child4ShortNameOld,
|
||||
p.PositionOld,
|
||||
p.posMasterNoOld,
|
||||
p.posTypeOldId,
|
||||
p.posTypeNameOld,
|
||||
p.posLevelOldId,
|
||||
p.posLevelNameOld,
|
||||
p.CreatedAt,
|
||||
p.Reason,
|
||||
p.Status,
|
||||
|
|
@ -149,20 +156,26 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
p.prefix,
|
||||
p.firstName,
|
||||
p.lastName,
|
||||
p.root,
|
||||
p.rootShortName,
|
||||
p.child1,
|
||||
p.child1ShortName,
|
||||
p.child2,
|
||||
p.child2ShortName,
|
||||
p.child3,
|
||||
p.child3ShortName,
|
||||
p.child4,
|
||||
p.child4ShortName,
|
||||
p.posMasterNo,
|
||||
p.position,
|
||||
p.posLevelName,
|
||||
p.posTypeName,
|
||||
p.rootOld,
|
||||
p.rootOldId,
|
||||
p.rootShortNameOld,
|
||||
p.child1Old,
|
||||
p.child1OldId,
|
||||
p.child1ShortNameOld,
|
||||
p.child2Old,
|
||||
p.child2OldId,
|
||||
p.child2ShortNameOld,
|
||||
p.child3Old,
|
||||
p.child3OldId,
|
||||
p.child3ShortNameOld,
|
||||
p.child4Old,
|
||||
p.child4OldId,
|
||||
p.child4ShortNameOld,
|
||||
p.posMasterNoOld,
|
||||
p.posTypeOldId,
|
||||
p.posTypeNameOld,
|
||||
p.posLevelOldId,
|
||||
p.posLevelNameOld,
|
||||
p.CreatedAt,
|
||||
p.Reason,
|
||||
p.Status,
|
||||
|
|
@ -222,27 +235,26 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
placementOfficer.firstName = org.result.firstName;
|
||||
placementOfficer.lastName = org.result.lastName;
|
||||
placementOfficer.citizenId = org.result.citizenId;
|
||||
placementOfficer.root = org.result.root;
|
||||
placementOfficer.rootId = org.result.rootId;
|
||||
placementOfficer.rootShortName = org.result.rootShortName;
|
||||
placementOfficer.child1 = org.result.child1;
|
||||
placementOfficer.child1Id = org.result.child1Id;
|
||||
placementOfficer.child1ShortName = org.result.child1ShortName;
|
||||
placementOfficer.child2 = org.result.child2;
|
||||
placementOfficer.child2Id = org.result.child2Id;
|
||||
placementOfficer.child2ShortName = org.result.child2ShortName;
|
||||
placementOfficer.child3 = org.result.child3;
|
||||
placementOfficer.child3Id = org.result.child3Id;
|
||||
placementOfficer.child3ShortName = org.result.child3ShortName;
|
||||
placementOfficer.child4 = org.result.child4;
|
||||
placementOfficer.child4Id = org.result.child4Id;
|
||||
placementOfficer.child4ShortName = org.result.child4ShortName;
|
||||
placementOfficer.posMasterNo = org.result.posMasterNo;
|
||||
placementOfficer.position = org.result.position;
|
||||
placementOfficer.posTypeId = org.result.posTypeId;
|
||||
placementOfficer.posTypeName = org.result.posTypeName;
|
||||
placementOfficer.posLevelId = org.result.posLevelId;
|
||||
placementOfficer.posLevelName = org.result.posLevelName;
|
||||
placementOfficer.rootOld = org.result.root;
|
||||
placementOfficer.rootOldId = org.result.rootId;
|
||||
placementOfficer.rootShortNameOld = org.result.rootShortName;
|
||||
placementOfficer.child1Old = org.result.child1;
|
||||
placementOfficer.child1OldId = org.result.child1Id;
|
||||
placementOfficer.child1ShortNameOld = org.result.child1ShortName;
|
||||
placementOfficer.child2Old = org.result.child2;
|
||||
placementOfficer.child2OldId = org.result.child2Id;
|
||||
placementOfficer.child2ShortNameOld = org.result.child2ShortName;
|
||||
placementOfficer.child3Old = org.result.child3;
|
||||
placementOfficer.child3OldId = org.result.child3Id;
|
||||
placementOfficer.child3ShortNameOld = org.result.child3ShortName;
|
||||
placementOfficer.child4Old = org.result.child4;
|
||||
placementOfficer.child4OldId = org.result.child4Id;
|
||||
placementOfficer.child4ShortNameOld = org.result.child4ShortName;
|
||||
placementOfficer.posMasterNoOld = org.result.posMasterNo;
|
||||
placementOfficer.posTypeOldId = org.result.posTypeId;
|
||||
placementOfficer.posTypeNameOld = org.result.posTypeName;
|
||||
placementOfficer.posLevelOldId = org.result.posLevelId;
|
||||
placementOfficer.posLevelNameOld = org.result.posLevelName;
|
||||
|
||||
placementOfficer.PositionOld = org.result.position;
|
||||
placementOfficer.PositionLevelOld = org.result.posLevelName;
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
|
||||
var placementRepatriations = await _context.PlacementRepatriations.AsQueryable()
|
||||
.OrderByDescending(x => x.CreatedAt)
|
||||
.Where(x => PlacementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))))
|
||||
.Where(x => PlacementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id))))))
|
||||
.Select(p => new
|
||||
{
|
||||
p.Id,
|
||||
|
|
@ -100,20 +100,27 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
p.prefix,
|
||||
p.firstName,
|
||||
p.lastName,
|
||||
p.root,
|
||||
p.rootShortName,
|
||||
p.child1,
|
||||
p.child1ShortName,
|
||||
p.child2,
|
||||
p.child2ShortName,
|
||||
p.child3,
|
||||
p.child3ShortName,
|
||||
p.child4,
|
||||
p.child4ShortName,
|
||||
p.posMasterNo,
|
||||
p.position,
|
||||
p.posLevelName,
|
||||
p.posTypeName,
|
||||
p.rootOld,
|
||||
p.rootOldId,
|
||||
p.rootShortNameOld,
|
||||
p.child1Old,
|
||||
p.child1OldId,
|
||||
p.child1ShortNameOld,
|
||||
p.child2Old,
|
||||
p.child2OldId,
|
||||
p.child2ShortNameOld,
|
||||
p.child3Old,
|
||||
p.child3OldId,
|
||||
p.child3ShortNameOld,
|
||||
p.child4Old,
|
||||
p.child4OldId,
|
||||
p.child4ShortNameOld,
|
||||
p.PositionOld,
|
||||
p.posMasterNoOld,
|
||||
p.posTypeOldId,
|
||||
p.posTypeNameOld,
|
||||
p.posLevelOldId,
|
||||
p.posLevelNameOld,
|
||||
p.CreatedAt,
|
||||
p.Organization,
|
||||
p.Reason,
|
||||
|
|
@ -154,20 +161,26 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
p.prefix,
|
||||
p.firstName,
|
||||
p.lastName,
|
||||
p.root,
|
||||
p.rootShortName,
|
||||
p.child1,
|
||||
p.child1ShortName,
|
||||
p.child2,
|
||||
p.child2ShortName,
|
||||
p.child3,
|
||||
p.child3ShortName,
|
||||
p.child4,
|
||||
p.child4ShortName,
|
||||
p.posMasterNo,
|
||||
p.position,
|
||||
p.posLevelName,
|
||||
p.posTypeName,
|
||||
p.rootOld,
|
||||
p.rootOldId,
|
||||
p.rootShortNameOld,
|
||||
p.child1Old,
|
||||
p.child1OldId,
|
||||
p.child1ShortNameOld,
|
||||
p.child2Old,
|
||||
p.child2OldId,
|
||||
p.child2ShortNameOld,
|
||||
p.child3Old,
|
||||
p.child3OldId,
|
||||
p.child3ShortNameOld,
|
||||
p.child4Old,
|
||||
p.child4OldId,
|
||||
p.child4ShortNameOld,
|
||||
p.posMasterNoOld,
|
||||
p.posTypeOldId,
|
||||
p.posTypeNameOld,
|
||||
p.posLevelOldId,
|
||||
p.posLevelNameOld,
|
||||
p.Reason,
|
||||
p.Status,
|
||||
p.Organization,
|
||||
|
|
@ -229,27 +242,26 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
placementRepatriation.firstName = org.result.firstName;
|
||||
placementRepatriation.lastName = org.result.lastName;
|
||||
placementRepatriation.citizenId = org.result.citizenId;
|
||||
placementRepatriation.root = org.result.root;
|
||||
placementRepatriation.rootId = org.result.rootId;
|
||||
placementRepatriation.rootShortName = org.result.rootShortName;
|
||||
placementRepatriation.child1 = org.result.child1;
|
||||
placementRepatriation.child1Id = org.result.child1Id;
|
||||
placementRepatriation.child1ShortName = org.result.child1ShortName;
|
||||
placementRepatriation.child2 = org.result.child2;
|
||||
placementRepatriation.child2Id = org.result.child2Id;
|
||||
placementRepatriation.child2ShortName = org.result.child2ShortName;
|
||||
placementRepatriation.child3 = org.result.child3;
|
||||
placementRepatriation.child3Id = org.result.child3Id;
|
||||
placementRepatriation.child3ShortName = org.result.child3ShortName;
|
||||
placementRepatriation.child4 = org.result.child4;
|
||||
placementRepatriation.child4Id = org.result.child4Id;
|
||||
placementRepatriation.child4ShortName = org.result.child4ShortName;
|
||||
placementRepatriation.posMasterNo = org.result.posMasterNo;
|
||||
placementRepatriation.position = org.result.position;
|
||||
placementRepatriation.posTypeId = org.result.posTypeId;
|
||||
placementRepatriation.posTypeName = org.result.posTypeName;
|
||||
placementRepatriation.posLevelId = org.result.posLevelId;
|
||||
placementRepatriation.posLevelName = org.result.posLevelName;
|
||||
placementRepatriation.rootOld = org.result.root;
|
||||
placementRepatriation.rootOldId = org.result.rootId;
|
||||
placementRepatriation.rootShortNameOld = org.result.rootShortName;
|
||||
placementRepatriation.child1Old = org.result.child1;
|
||||
placementRepatriation.child1OldId = org.result.child1Id;
|
||||
placementRepatriation.child1ShortNameOld = org.result.child1ShortName;
|
||||
placementRepatriation.child2Old = org.result.child2;
|
||||
placementRepatriation.child2OldId = org.result.child2Id;
|
||||
placementRepatriation.child2ShortNameOld = org.result.child2ShortName;
|
||||
placementRepatriation.child3Old = org.result.child3;
|
||||
placementRepatriation.child3OldId = org.result.child3Id;
|
||||
placementRepatriation.child3ShortNameOld = org.result.child3ShortName;
|
||||
placementRepatriation.child4Old = org.result.child4;
|
||||
placementRepatriation.child4OldId = org.result.child4Id;
|
||||
placementRepatriation.child4ShortNameOld = org.result.child4ShortName;
|
||||
placementRepatriation.posMasterNoOld = org.result.posMasterNo;
|
||||
placementRepatriation.posTypeOldId = org.result.posTypeId;
|
||||
placementRepatriation.posTypeNameOld = org.result.posTypeName;
|
||||
placementRepatriation.posLevelOldId = org.result.posLevelId;
|
||||
placementRepatriation.posLevelNameOld = org.result.posLevelName;
|
||||
|
||||
placementRepatriation.PositionOld = org.result.position;
|
||||
placementRepatriation.PositionLevelOld = org.result.posLevelName;
|
||||
|
|
|
|||
|
|
@ -90,20 +90,26 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
p.prefix,
|
||||
p.firstName,
|
||||
p.lastName,
|
||||
p.root,
|
||||
p.rootShortName,
|
||||
p.child1,
|
||||
p.child1ShortName,
|
||||
p.child2,
|
||||
p.child2ShortName,
|
||||
p.child3,
|
||||
p.child3ShortName,
|
||||
p.child4,
|
||||
p.child4ShortName,
|
||||
p.posMasterNo,
|
||||
p.position,
|
||||
p.posLevelName,
|
||||
p.posTypeName,
|
||||
p.rootOld,
|
||||
p.rootOldId,
|
||||
p.rootShortNameOld,
|
||||
p.child1Old,
|
||||
p.child1OldId,
|
||||
p.child1ShortNameOld,
|
||||
p.child2Old,
|
||||
p.child2OldId,
|
||||
p.child2ShortNameOld,
|
||||
p.child3Old,
|
||||
p.child3OldId,
|
||||
p.child3ShortNameOld,
|
||||
p.child4Old,
|
||||
p.child4OldId,
|
||||
p.child4ShortNameOld,
|
||||
p.posMasterNoOld,
|
||||
p.posTypeOldId,
|
||||
p.posTypeNameOld,
|
||||
p.posLevelOldId,
|
||||
p.posLevelNameOld,
|
||||
p.CreatedAt,
|
||||
p.Organization,
|
||||
p.Reason,
|
||||
|
|
@ -157,39 +163,46 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
|
||||
var placementTransfers = await _context.PlacementTransfers.AsQueryable()
|
||||
.OrderByDescending(x => x.CreatedAt)
|
||||
.Where(x => PlacementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))))
|
||||
.Where(x => PlacementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id))))))
|
||||
.Select(p => new
|
||||
{
|
||||
p.Id,
|
||||
p.profileId,
|
||||
p.prefix,
|
||||
p.firstName,
|
||||
p.lastName,
|
||||
p.root,
|
||||
p.rootShortName,
|
||||
p.child1,
|
||||
p.child1ShortName,
|
||||
p.child2,
|
||||
p.child2ShortName,
|
||||
p.child3,
|
||||
p.child3ShortName,
|
||||
p.child4,
|
||||
p.child4ShortName,
|
||||
p.posMasterNo,
|
||||
p.position,
|
||||
p.posLevelName,
|
||||
p.posTypeName,
|
||||
p.CreatedAt,
|
||||
p.Organization,
|
||||
p.Reason,
|
||||
p.Status,
|
||||
p.Date,
|
||||
salary = p.AmountOld,
|
||||
p.PositionTypeOld,
|
||||
p.PositionLevelOld,
|
||||
p.PositionNumberOld,
|
||||
p.OrganizationPositionOld,
|
||||
p.IsActive,
|
||||
p.Id,
|
||||
p.profileId,
|
||||
p.prefix,
|
||||
p.firstName,
|
||||
p.lastName,
|
||||
p.rootOld,
|
||||
p.rootOldId,
|
||||
p.rootShortNameOld,
|
||||
p.child1Old,
|
||||
p.child1OldId,
|
||||
p.child1ShortNameOld,
|
||||
p.child2Old,
|
||||
p.child2OldId,
|
||||
p.child2ShortNameOld,
|
||||
p.child3Old,
|
||||
p.child3OldId,
|
||||
p.child3ShortNameOld,
|
||||
p.child4Old,
|
||||
p.child4OldId,
|
||||
p.child4ShortNameOld,
|
||||
p.PositionOld,
|
||||
p.posMasterNoOld,
|
||||
p.posTypeOldId,
|
||||
p.posTypeNameOld,
|
||||
p.posLevelOldId,
|
||||
p.posLevelNameOld,
|
||||
p.CreatedAt,
|
||||
p.Organization,
|
||||
p.Reason,
|
||||
p.Status,
|
||||
p.Date,
|
||||
salary = p.AmountOld,
|
||||
p.PositionTypeOld,
|
||||
p.PositionLevelOld,
|
||||
p.PositionNumberOld,
|
||||
p.OrganizationPositionOld,
|
||||
p.IsActive,
|
||||
})
|
||||
.ToListAsync();
|
||||
|
||||
|
|
@ -218,20 +231,26 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
p.prefix,
|
||||
p.firstName,
|
||||
p.lastName,
|
||||
p.root,
|
||||
p.rootShortName,
|
||||
p.child1,
|
||||
p.child1ShortName,
|
||||
p.child2,
|
||||
p.child2ShortName,
|
||||
p.child3,
|
||||
p.child3ShortName,
|
||||
p.child4,
|
||||
p.child4ShortName,
|
||||
p.posMasterNo,
|
||||
p.position,
|
||||
p.posLevelName,
|
||||
p.posTypeName,
|
||||
p.rootOld,
|
||||
p.rootOldId,
|
||||
p.rootShortNameOld,
|
||||
p.child1Old,
|
||||
p.child1OldId,
|
||||
p.child1ShortNameOld,
|
||||
p.child2Old,
|
||||
p.child2OldId,
|
||||
p.child2ShortNameOld,
|
||||
p.child3Old,
|
||||
p.child3OldId,
|
||||
p.child3ShortNameOld,
|
||||
p.child4Old,
|
||||
p.child4OldId,
|
||||
p.child4ShortNameOld,
|
||||
p.posMasterNoOld,
|
||||
p.posTypeOldId,
|
||||
p.posTypeNameOld,
|
||||
p.posLevelOldId,
|
||||
p.posLevelNameOld,
|
||||
p.Reason,
|
||||
p.Status,
|
||||
p.Organization,
|
||||
|
|
@ -266,20 +285,26 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
data.prefix,
|
||||
data.firstName,
|
||||
data.lastName,
|
||||
data.root,
|
||||
data.rootShortName,
|
||||
data.child1,
|
||||
data.child1ShortName,
|
||||
data.child2,
|
||||
data.child2ShortName,
|
||||
data.child3,
|
||||
data.child3ShortName,
|
||||
data.child4,
|
||||
data.child4ShortName,
|
||||
data.posMasterNo,
|
||||
data.position,
|
||||
data.posLevelName,
|
||||
data.posTypeName,
|
||||
data.rootOld,
|
||||
data.rootOldId,
|
||||
data.rootShortNameOld,
|
||||
data.child1Old,
|
||||
data.child1OldId,
|
||||
data.child1ShortNameOld,
|
||||
data.child2Old,
|
||||
data.child2OldId,
|
||||
data.child2ShortNameOld,
|
||||
data.child3Old,
|
||||
data.child3OldId,
|
||||
data.child3ShortNameOld,
|
||||
data.child4Old,
|
||||
data.child4OldId,
|
||||
data.child4ShortNameOld,
|
||||
data.posMasterNoOld,
|
||||
data.posTypeOldId,
|
||||
data.posTypeNameOld,
|
||||
data.posLevelOldId,
|
||||
data.posLevelNameOld,
|
||||
data.Reason,
|
||||
data.Status,
|
||||
data.Organization,
|
||||
|
|
@ -318,20 +343,26 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
p.prefix,
|
||||
p.firstName,
|
||||
p.lastName,
|
||||
p.root,
|
||||
p.rootShortName,
|
||||
p.child1,
|
||||
p.child1ShortName,
|
||||
p.child2,
|
||||
p.child2ShortName,
|
||||
p.child3,
|
||||
p.child3ShortName,
|
||||
p.child4,
|
||||
p.child4ShortName,
|
||||
p.posMasterNo,
|
||||
p.position,
|
||||
p.posLevelName,
|
||||
p.posTypeName,
|
||||
p.rootOld,
|
||||
p.rootOldId,
|
||||
p.rootShortNameOld,
|
||||
p.child1Old,
|
||||
p.child1OldId,
|
||||
p.child1ShortNameOld,
|
||||
p.child2Old,
|
||||
p.child2OldId,
|
||||
p.child2ShortNameOld,
|
||||
p.child3Old,
|
||||
p.child3OldId,
|
||||
p.child3ShortNameOld,
|
||||
p.child4Old,
|
||||
p.child4OldId,
|
||||
p.child4ShortNameOld,
|
||||
p.posMasterNoOld,
|
||||
p.posTypeOldId,
|
||||
p.posTypeNameOld,
|
||||
p.posLevelOldId,
|
||||
p.posLevelNameOld,
|
||||
p.Reason,
|
||||
p.Status,
|
||||
p.Organization,
|
||||
|
|
@ -366,20 +397,26 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
data.prefix,
|
||||
data.firstName,
|
||||
data.lastName,
|
||||
data.root,
|
||||
data.rootShortName,
|
||||
data.child1,
|
||||
data.child1ShortName,
|
||||
data.child2,
|
||||
data.child2ShortName,
|
||||
data.child3,
|
||||
data.child3ShortName,
|
||||
data.child4,
|
||||
data.child4ShortName,
|
||||
data.posMasterNo,
|
||||
data.position,
|
||||
data.posLevelName,
|
||||
data.posTypeName,
|
||||
data.rootOld,
|
||||
data.rootOldId,
|
||||
data.rootShortNameOld,
|
||||
data.child1Old,
|
||||
data.child1OldId,
|
||||
data.child1ShortNameOld,
|
||||
data.child2Old,
|
||||
data.child2OldId,
|
||||
data.child2ShortNameOld,
|
||||
data.child3Old,
|
||||
data.child3OldId,
|
||||
data.child3ShortNameOld,
|
||||
data.child4Old,
|
||||
data.child4OldId,
|
||||
data.child4ShortNameOld,
|
||||
data.posMasterNoOld,
|
||||
data.posTypeOldId,
|
||||
data.posTypeNameOld,
|
||||
data.posLevelOldId,
|
||||
data.posLevelNameOld,
|
||||
data.Reason,
|
||||
data.Status,
|
||||
data.Organization,
|
||||
|
|
@ -438,27 +475,26 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
placementTransfer.firstName = org.result.firstName;
|
||||
placementTransfer.lastName = org.result.lastName;
|
||||
placementTransfer.citizenId = org.result.citizenId;
|
||||
placementTransfer.root = org.result.root;
|
||||
placementTransfer.rootId = org.result.rootId;
|
||||
placementTransfer.rootShortName = org.result.rootShortName;
|
||||
placementTransfer.child1 = org.result.child1;
|
||||
placementTransfer.child1Id = org.result.child1Id;
|
||||
placementTransfer.child1ShortName = org.result.child1ShortName;
|
||||
placementTransfer.child2 = org.result.child2;
|
||||
placementTransfer.child2Id = org.result.child2Id;
|
||||
placementTransfer.child2ShortName = org.result.child2ShortName;
|
||||
placementTransfer.child3 = org.result.child3;
|
||||
placementTransfer.child3Id = org.result.child3Id;
|
||||
placementTransfer.child3ShortName = org.result.child3ShortName;
|
||||
placementTransfer.child4 = org.result.child4;
|
||||
placementTransfer.child4Id = org.result.child4Id;
|
||||
placementTransfer.child4ShortName = org.result.child4ShortName;
|
||||
placementTransfer.posMasterNo = org.result.posMasterNo;
|
||||
placementTransfer.position = org.result.position;
|
||||
placementTransfer.posTypeId = org.result.posTypeId;
|
||||
placementTransfer.posTypeName = org.result.posTypeName;
|
||||
placementTransfer.posLevelId = org.result.posLevelId;
|
||||
placementTransfer.posLevelName = org.result.posLevelName;
|
||||
placementTransfer.rootOld = org.result.root;
|
||||
placementTransfer.rootOldId = org.result.rootId;
|
||||
placementTransfer.rootShortNameOld = org.result.rootShortName;
|
||||
placementTransfer.child1Old = org.result.child1;
|
||||
placementTransfer.child1OldId = org.result.child1Id;
|
||||
placementTransfer.child1ShortNameOld = org.result.child1ShortName;
|
||||
placementTransfer.child2Old = org.result.child2;
|
||||
placementTransfer.child2OldId = org.result.child2Id;
|
||||
placementTransfer.child2ShortNameOld = org.result.child2ShortName;
|
||||
placementTransfer.child3Old = org.result.child3;
|
||||
placementTransfer.child3OldId = org.result.child3Id;
|
||||
placementTransfer.child3ShortNameOld = org.result.child3ShortName;
|
||||
placementTransfer.child4Old = org.result.child4;
|
||||
placementTransfer.child4OldId = org.result.child4Id;
|
||||
placementTransfer.child4ShortNameOld = org.result.child4ShortName;
|
||||
placementTransfer.posMasterNoOld = org.result.posMasterNo;
|
||||
placementTransfer.posTypeOldId = org.result.posTypeId;
|
||||
placementTransfer.posTypeNameOld = org.result.posTypeName;
|
||||
placementTransfer.posLevelOldId = org.result.posLevelId;
|
||||
placementTransfer.posLevelNameOld = org.result.posLevelName;
|
||||
|
||||
placementTransfer.PositionOld = org.result.position;
|
||||
placementTransfer.PositionLevelOld = org.result.posLevelName;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue