diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs index 5161b5f9..0b6860f4 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs @@ -414,44 +414,44 @@ namespace BMA.EHR.Placement.Service.Controllers uppdated.Prefix = save; } - if (req.RelationshipId != null) - { - var save = await _context.Relationships.FindAsync(req.RelationshipId); - if (save == null) - return Error(GlobalMessages.RelationshipNotFound, 404); - uppdated.Relationship = save; - } + // if (req.RelationshipId != null) + // { + // var save = await _context.Relationships.FindAsync(req.RelationshipId); + // if (save == null) + // return Error(GlobalMessages.RelationshipNotFound, 404); + // uppdated.Relationship = save; + // } - if (req.ReligionId != null) - { - var save = await _context.Religions.FindAsync(req.ReligionId); - if (save == null) - return Error(GlobalMessages.ReligionNotFound, 404); - uppdated.Religion = save; - } + // if (req.ReligionId != null) + // { + // var save = await _context.Religions.FindAsync(req.ReligionId); + // if (save == null) + // return Error(GlobalMessages.ReligionNotFound, 404); + // uppdated.Religion = save; + // } - if (req.BloodGroupId != null) - { - var save = await _context.BloodGroups.FindAsync(req.BloodGroupId); - if (save == null) - return Error(GlobalMessages.BloodGroupNotFound, 404); - uppdated.BloodGroup = save; - } + // if (req.BloodGroupId != null) + // { + // var save = await _context.BloodGroups.FindAsync(req.BloodGroupId); + // if (save == null) + // return Error(GlobalMessages.BloodGroupNotFound, 404); + // uppdated.BloodGroup = save; + // } - if (req.GenderId != null) - { - var save = await _context.Genders.FindAsync(req.GenderId); - if (save == null) - return Error(GlobalMessages.GenderNotFound, 404); - uppdated.Gender = save; - } + // if (req.GenderId != null) + // { + // var save = await _context.Genders.FindAsync(req.GenderId); + // if (save == null) + // return Error(GlobalMessages.GenderNotFound, 404); + // uppdated.Gender = save; + // } uppdated.CitizenId = req.CitizenId; uppdated.Firstname = req.Firstname; uppdated.Lastname = req.Lastname; - uppdated.DateOfBirth = req.DateOfBirth; - uppdated.Nationality = req.Nationality; - uppdated.Race = req.Race; - uppdated.TelephoneNumber = req.TelephoneNumber; + // uppdated.DateOfBirth = req.DateOfBirth; + // uppdated.Nationality = req.Nationality; + // uppdated.Race = req.Race; + // uppdated.TelephoneNumber = req.TelephoneNumber; uppdated.EducationOld = req.EducationOld; uppdated.Reason = req.Reason; uppdated.OrganizationPositionOld = req.OrganizationPositionOld; diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs index 36d21792..cf2daa77 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs @@ -314,9 +314,9 @@ namespace BMA.EHR.Retirement.Service.Controllers Prefix = orgPos!.Profile!.Prefix!.Name, FirstName = orgPos!.Profile!.FirstName!, LastName = orgPos!.Profile!.LastName!, - // IsSendMail = req.IsSendMail, - // IsSendInbox = req.IsSendInbox, - // IsSendNotification = req.IsSendNotification, + IsSendMail = true, + IsSendInbox = true, + IsSendNotification = true, OrganizationName = orgPos!.OrganizationPosition!.Organization!.OrganizationOrganization!.Name, PositionName = orgPos!.OrganizationPosition!.PositionMaster!.PositionPath!.Name, ReceiveUser = profile,