hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

หนังสือเวียน set noti ทุกอัน

Browse source
This commit is contained in:
Kittapath 2023-09-12 23:17:25 +07:00
parent 0da46a261d
commit b1afd72503
2 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -414,44 +414,44 @@ namespace BMA.EHR.Placement.Service.Controllers
uppdated.Prefix = save; uppdated.Prefix = save;
} }
if (req.RelationshipId != null) // if (req.RelationshipId != null)
{ // {
var save = await _context.Relationships.FindAsync(req.RelationshipId); // var save = await _context.Relationships.FindAsync(req.RelationshipId);
if (save == null) // if (save == null)
return Error(GlobalMessages.RelationshipNotFound, 404); // return Error(GlobalMessages.RelationshipNotFound, 404);
uppdated.Relationship = save; // uppdated.Relationship = save;
} // }
if (req.ReligionId != null) // if (req.ReligionId != null)
{ // {
var save = await _context.Religions.FindAsync(req.ReligionId); // var save = await _context.Religions.FindAsync(req.ReligionId);
if (save == null) // if (save == null)
return Error(GlobalMessages.ReligionNotFound, 404); // return Error(GlobalMessages.ReligionNotFound, 404);
uppdated.Religion = save; // uppdated.Religion = save;
} // }
if (req.BloodGroupId != null) // if (req.BloodGroupId != null)
{ // {
var save = await _context.BloodGroups.FindAsync(req.BloodGroupId); // var save = await _context.BloodGroups.FindAsync(req.BloodGroupId);
if (save == null) // if (save == null)
return Error(GlobalMessages.BloodGroupNotFound, 404); // return Error(GlobalMessages.BloodGroupNotFound, 404);
uppdated.BloodGroup = save; // uppdated.BloodGroup = save;
} // }
if (req.GenderId != null) // if (req.GenderId != null)
{ // {
var save = await _context.Genders.FindAsync(req.GenderId); // var save = await _context.Genders.FindAsync(req.GenderId);
if (save == null) // if (save == null)
return Error(GlobalMessages.GenderNotFound, 404); // return Error(GlobalMessages.GenderNotFound, 404);
uppdated.Gender = save; // uppdated.Gender = save;
} // }
uppdated.CitizenId = req.CitizenId; uppdated.CitizenId = req.CitizenId;
uppdated.Firstname = req.Firstname; uppdated.Firstname = req.Firstname;
uppdated.Lastname = req.Lastname; uppdated.Lastname = req.Lastname;
uppdated.DateOfBirth = req.DateOfBirth; // uppdated.DateOfBirth = req.DateOfBirth;
uppdated.Nationality = req.Nationality; // uppdated.Nationality = req.Nationality;
uppdated.Race = req.Race; // uppdated.Race = req.Race;
uppdated.TelephoneNumber = req.TelephoneNumber; // uppdated.TelephoneNumber = req.TelephoneNumber;
uppdated.EducationOld = req.EducationOld; uppdated.EducationOld = req.EducationOld;
uppdated.Reason = req.Reason; uppdated.Reason = req.Reason;
uppdated.OrganizationPositionOld = req.OrganizationPositionOld; uppdated.OrganizationPositionOld = req.OrganizationPositionOld;

6
BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
View file

@ -314,9 +314,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
Prefix = orgPos!.Profile!.Prefix!.Name, Prefix = orgPos!.Profile!.Prefix!.Name,
FirstName = orgPos!.Profile!.FirstName!, FirstName = orgPos!.Profile!.FirstName!,
LastName = orgPos!.Profile!.LastName!, LastName = orgPos!.Profile!.LastName!,
// IsSendMail = req.IsSendMail, IsSendMail = true,
// IsSendInbox = req.IsSendInbox, IsSendInbox = true,
// IsSendNotification = req.IsSendNotification, IsSendNotification = true,
OrganizationName = orgPos!.OrganizationPosition!.Organization!.OrganizationOrganization!.Name, OrganizationName = orgPos!.OrganizationPosition!.Organization!.OrganizationOrganization!.Name,
PositionName = orgPos!.OrganizationPosition!.PositionMaster!.PositionPath!.Name, PositionName = orgPos!.OrganizationPosition!.PositionMaster!.PositionPath!.Name,
ReceiveUser = profile, ReceiveUser = profile,