diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs index 3da489f3..fee01fb8 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs @@ -156,6 +156,7 @@ namespace BMA.EHR.Placement.Service.Controllers p.OrganizationPositionOld, p.PositionDate, PlacementAppointmentDocs = p.PlacementAppointmentDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }), + Avatar = p.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Avatar.Id, }) .FirstOrDefaultAsync(); if (data == null) @@ -207,6 +208,7 @@ namespace BMA.EHR.Placement.Service.Controllers data.PositionNumberOld, data.OrganizationPositionOld, data.PositionDate, + Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar), Docs = placementAppointmentDocs, }; diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index 075b973f..98bc4571 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -1174,5 +1174,14 @@ namespace BMA.EHR.Placement.Service.Controllers return Success(new { caregiver, commander, chairman = new List() }); } + [HttpGet("file/{docId:length(36)}")] + public async Task> GetPathFile(Guid docId) + { + if (docId == Guid.Parse("00000000-0000-0000-0000-000000000000")) + return Error(GlobalMessages.DataNotFound, 404); + var path = await _documentService.ImagesPath(docId); + return Success(path); + } + } } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs index 7c399ba7..55665cc8 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs @@ -127,12 +127,38 @@ namespace BMA.EHR.Placement.Service.Controllers p.PositionLevelOld, p.PositionNumberOld, p.OrganizationPositionOld, + Avatar = p.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Avatar.Id, }) .FirstOrDefaultAsync(); if (data == null) return Error(GlobalMessages.DataNotFound, 404); + var _data = new + { + data.Id, + data.PrefixId, + data.Prefix, + data.FirstName, + data.LastName, + data.ProfileId, + data.position, + data.posNo, + data.positionLevel, + data.organizationOrganization, + data.Reason, + data.Status, + data.Organization, + data.DateStart, + data.DateEnd, + data.salary, + data.CreatedAt, + data.PositionTypeOld, + data.PositionLevelOld, + data.PositionNumberOld, + data.OrganizationPositionOld, + Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar), + }; - return Success(data); + return Success(_data); } /// diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementRelocationController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementRelocationController.cs index d32ff65b..63279a90 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementRelocationController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementRelocationController.cs @@ -154,6 +154,7 @@ namespace BMA.EHR.Placement.Service.Controllers p.PositionNumberOld, p.OrganizationPositionOld, PlacementRelocationDocs = p.PlacementRelocationDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }), + Avatar = p.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Avatar.Id, }) .FirstOrDefaultAsync(); if (data == null) @@ -204,6 +205,7 @@ namespace BMA.EHR.Placement.Service.Controllers data.PositionLevelOld, data.PositionNumberOld, data.OrganizationPositionOld, + Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar), Docs = placementRelocationDocs, }; diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs index baf10add..77b9075c 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs @@ -125,12 +125,37 @@ namespace BMA.EHR.Placement.Service.Controllers p.PositionLevelOld, p.PositionNumberOld, p.OrganizationPositionOld, + Avatar = p.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Avatar.Id, }) .FirstOrDefaultAsync(); if (data == null) return Error(GlobalMessages.DataNotFound, 404); + var _data = new + { + data.Id, + data.PrefixId, + data.Prefix, + data.FirstName, + data.LastName, + data.ProfileId, + data.position, + data.posNo, + data.positionLevel, + data.organizationOrganization, + data.Reason, + data.Status, + data.Organization, + data.Date, + data.salary, + data.CreatedAt, + data.PositionTypeOld, + data.PositionLevelOld, + data.PositionNumberOld, + data.OrganizationPositionOld, + Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar), + }; - return Success(data); + return Success(_data); } /// diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs index 872add69..3fc4057e 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs @@ -169,6 +169,7 @@ namespace BMA.EHR.Placement.Service.Controllers p.PositionLevelOld, p.PositionNumberOld, p.OrganizationPositionOld, + Avatar = p.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Avatar.Id, PlacementTransferDocs = p.PlacementTransferDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }), }) .FirstOrDefaultAsync(); @@ -207,6 +208,7 @@ namespace BMA.EHR.Placement.Service.Controllers data.PositionLevelOld, data.PositionNumberOld, data.OrganizationPositionOld, + Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar), Docs = placementTransferDocs, }; diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs index 6793f2e5..f76dff6d 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs @@ -166,6 +166,7 @@ namespace BMA.EHR.Retirement.Service.Controllers PathName = p.Document == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Document.Id, p.IsActive, p.CreatedAt, + Avatar = p.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Avatar.Id, }) .FirstOrDefaultAsync(); if (data == null) @@ -198,6 +199,7 @@ namespace BMA.EHR.Retirement.Service.Controllers PathName = data.PathName == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.PathName), data.IsActive, data.CreatedAt, + Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar), }; return Success(_data); diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementDischargeController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementDischargeController.cs index 463fdd05..287401dc 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementDischargeController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementDischargeController.cs @@ -125,12 +125,37 @@ namespace BMA.EHR.Retirement.Service.Controllers p.PositionLevelOld, p.PositionNumberOld, p.OrganizationPositionOld, + Avatar = p.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Avatar.Id, }) .FirstOrDefaultAsync(); if (data == null) return Error(GlobalMessages.DataNotFound, 404); + var _data = new + { + data.Id, + data.PrefixId, + data.Prefix, + data.FirstName, + data.LastName, + data.ProfileId, + data.position, + data.posNo, + data.positionLevel, + data.organizationOrganization, + data.Reason, + data.Status, + data.Organization, + data.Date, + data.salary, + data.CreatedAt, + data.PositionTypeOld, + data.PositionLevelOld, + data.PositionNumberOld, + data.OrganizationPositionOld, + Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar), + }; - return Success(data); + return Success(_data); } /// diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementExpulsionController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementExpulsionController.cs index 1ef32846..1a48a5da 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementExpulsionController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementExpulsionController.cs @@ -125,12 +125,37 @@ namespace BMA.EHR.Retirement.Service.Controllers p.PositionLevelOld, p.PositionNumberOld, p.OrganizationPositionOld, + Avatar = p.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Avatar.Id, }) .FirstOrDefaultAsync(); if (data == null) return Error(GlobalMessages.DataNotFound, 404); + var _data = new + { + data.Id, + data.PrefixId, + data.Prefix, + data.FirstName, + data.LastName, + data.ProfileId, + data.position, + data.posNo, + data.positionLevel, + data.organizationOrganization, + data.Reason, + data.Status, + data.Organization, + data.Date, + data.salary, + data.CreatedAt, + data.PositionTypeOld, + data.PositionLevelOld, + data.PositionNumberOld, + data.OrganizationPositionOld, + Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar), + }; - return Success(data); + return Success(_data); } /// diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs index 3b331344..a378d83e 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs @@ -155,6 +155,7 @@ namespace BMA.EHR.Retirement.Service.Controllers p.PositionNumberOld, p.OrganizationPositionOld, p.PositionDate, + Avatar = p.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Avatar.Id, RetirementOtherDocs = p.RetirementOtherDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }), }) .FirstOrDefaultAsync(); @@ -207,6 +208,7 @@ namespace BMA.EHR.Retirement.Service.Controllers data.PositionNumberOld, data.OrganizationPositionOld, data.PositionDate, + Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar), Docs = retirementOtherDocs, }; diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs index 2b2a8240..ac49f6f1 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs @@ -125,12 +125,37 @@ namespace BMA.EHR.Retirement.Service.Controllers p.PositionLevelOld, p.PositionNumberOld, p.OrganizationPositionOld, + Avatar = p.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Avatar.Id, }) .FirstOrDefaultAsync(); if (data == null) return Error(GlobalMessages.DataNotFound, 404); + var _data = new + { + data.Id, + data.PrefixId, + data.Prefix, + data.FirstName, + data.LastName, + data.ProfileId, + data.position, + data.posNo, + data.positionLevel, + data.organizationOrganization, + data.Reason, + data.Status, + data.Organization, + data.Date, + data.salary, + data.CreatedAt, + data.PositionTypeOld, + data.PositionLevelOld, + data.PositionNumberOld, + data.OrganizationPositionOld, + Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar), + }; - return Success(data); + return Success(_data); } /// diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs index c7fa67ec..93556f00 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs @@ -222,6 +222,7 @@ namespace BMA.EHR.Retirement.Service.Controllers p.CommanderApproveReason, p.CommanderRejectReason, p.CommanderRejectDate, + Avatar = p.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Avatar.Id, RetirementResignDocs = p.RetirementResignDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }), }) .FirstOrDefaultAsync(); @@ -268,6 +269,7 @@ namespace BMA.EHR.Retirement.Service.Controllers data.CommanderApproveReason, data.CommanderRejectReason, data.CommanderRejectDate, + Avatar = data.Avatar == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.Avatar), Docs = retirementResignDocs, }; @@ -670,6 +672,7 @@ namespace BMA.EHR.Retirement.Service.Controllers .Select(p => new { Id = p.Id, + PrefixId = p.RetirementResign.Profile.Prefix == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.RetirementResign.Profile.Prefix.Id, Position = p.RetirementResign.Profile.Position == null ? null : p.RetirementResign.Profile.Position.Name, PositionLevel = p.RetirementResign.Profile.PositionLevel == null ? null : p.RetirementResign.Profile.PositionLevel.Name, Org = p.RetirementResign.Profile.OcId == null ? null : p.RetirementResign.Profile.OcId, @@ -694,6 +697,7 @@ namespace BMA.EHR.Retirement.Service.Controllers Suggestion = p.Suggestion, AppointDate = p.AppointDate, LastUpdatedAt = p.LastUpdatedAt, + OrganizationPositionOld = p.RetirementResign.OrganizationPositionOld, CreatedAt = p.CreatedAt, }) .FirstOrDefaultAsync(); @@ -702,6 +706,7 @@ namespace BMA.EHR.Retirement.Service.Controllers var _data = new { data.Id, + data.PrefixId, data.Position, data.PositionLevel, Org = data.Org == null ? null : FindOCFullPath(data.Org.Value, true), @@ -725,11 +730,12 @@ namespace BMA.EHR.Retirement.Service.Controllers data.FutureWorkReason, data.Suggestion, data.AppointDate, + data.OrganizationPositionOld, data.LastUpdatedAt, data.CreatedAt, }; - return Success(data); + return Success(_data); } ///