no message

This commit is contained in:
kittapath 2024-11-21 12:16:52 +07:00
parent 519ef2f143
commit f3e8330241
5 changed files with 19376 additions and 41 deletions

View file

@ -1199,8 +1199,8 @@ namespace BMA.EHR.Insignia.Service.Controllers
RequestInsigniaId = x.RequestInsignia.Id,
RequestInsigniaShortName = x.RequestInsignia.ShortName,
DateReceive = x.DateReceive,
OrganizationOrganizationSend = x.Root, //hardcode
OrganizationOrganizationReceive = x.Root, //hardcode
x.OrganizationOrganizationSend,
x.OrganizationOrganizationReceive,
Status = x.Status,
Issue = x.Issue,
Date = x.Date,
@ -1215,10 +1215,12 @@ namespace BMA.EHR.Insignia.Service.Controllers
Salary = x.Salary,
DateReceiveInsignia = x.DateReceiveInsignia,
DocReceiveInsignia = x.DocReceiveInsignia == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.DocReceiveInsignia.Id,
OrgReceiveInsignia = x.Root, //hardcode
x.OrgReceiveInsignia,
x.OrgReceiveInsigniaId,
DateReturnInsignia = x.DateReturnInsignia,
DocReturnInsignia = x.DocReturnInsignia == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.DocReturnInsignia.Id,
OrgReturnInsignia = x.Root, //hardcode
x.OrgReturnInsignia,
x.OrgReturnInsigniaId,
})
.ToListAsync();
@ -1236,8 +1238,8 @@ namespace BMA.EHR.Insignia.Service.Controllers
RequestInsigniaId = x.RequestInsigniaId,
RequestInsigniaShortName = x.RequestInsigniaShortName,
DateReceive = x.DateReceive,
OrganizationOrganizationSend = x.OrganizationOrganizationSend,
OrganizationOrganizationReceive = x.OrganizationOrganizationReceive,
x.OrganizationOrganizationSend,
x.OrganizationOrganizationReceive,
Status = x.Status,
Issue = x.Issue,
Date = x.Date,
@ -1252,10 +1254,12 @@ namespace BMA.EHR.Insignia.Service.Controllers
Salary = x.Salary,
DateReceiveInsignia = x.DateReceiveInsignia,
DocReceiveInsignia = x.DocReceiveInsignia,
OrgReceiveInsignia = x.OrgReceiveInsignia,
x.OrgReceiveInsignia,
x.OrgReceiveInsigniaId,
DateReturnInsignia = x.DateReturnInsignia,
DocReturnInsignia = x.DocReturnInsignia,
OrgReturnInsignia = x.OrgReturnInsignia,
x.OrgReturnInsignia,
x.OrgReturnInsigniaId,
})
.ToList();
@ -1292,9 +1296,11 @@ namespace BMA.EHR.Insignia.Service.Controllers
insigniaNoteProfile.DateReceiveInsignia,
DocReceiveInsignia = insigniaNoteProfile.DocReceiveInsignia == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(insigniaNoteProfile.DocReceiveInsignia),
insigniaNoteProfile.OrgReceiveInsignia,
insigniaNoteProfile.OrgReceiveInsigniaId,
insigniaNoteProfile.DateReturnInsignia,
DocReturnInsignia = insigniaNoteProfile.DocReturnInsignia == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(insigniaNoteProfile.DocReturnInsignia),
insigniaNoteProfile.OrgReturnInsignia,
insigniaNoteProfile.OrgReturnInsigniaId,
}
);
}
@ -1346,8 +1352,8 @@ namespace BMA.EHR.Insignia.Service.Controllers
RequestInsigniaId = x.RequestInsignia.Id,
RequestInsigniaShortName = x.RequestInsignia.ShortName,
DateReceive = x.DateReceive,
OrganizationOrganizationSend = x.Root, //hardcode
OrganizationOrganizationReceive = x.Root, //hardcode
x.OrganizationOrganizationSend,
x.OrganizationOrganizationReceive,
Status = x.Status,
Issue = x.Issue,
Date = x.Date,
@ -1362,10 +1368,12 @@ namespace BMA.EHR.Insignia.Service.Controllers
Salary = x.Salary,
DateReceiveInsignia = x.DateReceiveInsignia,
DocReceiveInsignia = x.DocReceiveInsignia == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.DocReceiveInsignia.Id,
OrgReceiveInsignia = x.Root, //hardcode
x.OrgReceiveInsignia,
x.OrgReceiveInsigniaId,
DateReturnInsignia = x.DateReturnInsignia,
DocReturnInsignia = x.DocReturnInsignia == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.DocReturnInsignia.Id,
OrgReturnInsignia = x.Root, //hardcode
x.OrgReturnInsignia,
x.OrgReturnInsigniaId,
})
.ToListAsync();
@ -1383,8 +1391,8 @@ namespace BMA.EHR.Insignia.Service.Controllers
RequestInsigniaId = x.RequestInsigniaId,
RequestInsigniaShortName = x.RequestInsigniaShortName,
DateReceive = x.DateReceive,
OrganizationOrganizationSend = x.OrganizationOrganizationSend,
OrganizationOrganizationReceive = x.OrganizationOrganizationReceive,
x.OrganizationOrganizationSend,
x.OrganizationOrganizationReceive,
Status = x.Status,
Issue = x.Issue,
Date = x.Date,
@ -1399,10 +1407,12 @@ namespace BMA.EHR.Insignia.Service.Controllers
Salary = x.Salary,
DateReceiveInsignia = x.DateReceiveInsignia,
DocReceiveInsignia = x.DocReceiveInsignia,
OrgReceiveInsignia = x.OrgReceiveInsignia,
x.OrgReceiveInsignia,
x.OrgReceiveInsigniaId,
DateReturnInsignia = x.DateReturnInsignia,
DocReturnInsignia = x.DocReturnInsignia,
OrgReturnInsignia = x.OrgReturnInsignia,
x.OrgReturnInsignia,
x.OrgReturnInsigniaId,
})
.ToList();
@ -1439,9 +1449,11 @@ namespace BMA.EHR.Insignia.Service.Controllers
insigniaNoteProfile.DateReceiveInsignia,
DocReceiveInsignia = insigniaNoteProfile.DocReceiveInsignia == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(insigniaNoteProfile.DocReceiveInsignia),
insigniaNoteProfile.OrgReceiveInsignia,
insigniaNoteProfile.OrgReceiveInsigniaId,
insigniaNoteProfile.DateReturnInsignia,
DocReturnInsignia = insigniaNoteProfile.DocReturnInsignia == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(insigniaNoteProfile.DocReturnInsignia),
insigniaNoteProfile.OrgReturnInsignia,
insigniaNoteProfile.OrgReturnInsigniaId,
}
);
}
@ -1478,8 +1490,8 @@ namespace BMA.EHR.Insignia.Service.Controllers
RequestInsigniaId = x.RequestInsignia.Id,
RequestInsigniaShortName = x.RequestInsignia.ShortName,
DateReceive = x.DateReceive,
OrganizationOrganizationSend = x.OrganizationOrganizationSend,
OrganizationOrganizationReceive = x.OrganizationOrganizationReceive,
x.OrganizationOrganizationSend,
x.OrganizationOrganizationReceive,
Status = x.Status,
Issue = x.Issue,
Date = x.Date,
@ -1578,7 +1590,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
Address = req.Address,
RequestInsignia = insignia,
OrganizationOrganizationReceive = req.OrganizationOrganizationReceive,
OrganizationOrganizationSend = req.OrganizationOrganizationSend,
req.OrganizationOrganizationSend,
InsigniaNote = insigniaNote,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
@ -2383,7 +2395,18 @@ namespace BMA.EHR.Insignia.Service.Controllers
var doc = await _documentService.UploadFileAsync(file, file.FileName);
insigniaNoteProfile.DocReturnInsignia = doc;
}
insigniaNoteProfile.OrgReturnInsignia = await _context.Organizations.Where(x => x.Id == req.OrgId).FirstOrDefaultAsync();
var root = _userProfileRepository.GetOc(req.OrgId, 0, AccessToken)?.Root ?? null;
if (req.OrgId != Guid.Parse("00000000-0000-0000-0000-000000000000"))
{
if (root == null)
return Error(GlobalMessages.OCNotFound, 404);
}
else
{
root = "สำนักนายกรัฐมนตรี";
}
insigniaNoteProfile.OrgReturnInsignia = root;
insigniaNoteProfile.OrgReturnInsigniaId = req.OrgId;
insigniaNoteProfile.DateReturnInsignia = req.Date;
insigniaNoteProfile.LastUpdateFullName = FullName ?? "System Administrator";
insigniaNoteProfile.LastUpdateUserId = UserId ?? "";
@ -2422,7 +2445,18 @@ namespace BMA.EHR.Insignia.Service.Controllers
var doc = await _documentService.UploadFileAsync(file, file.FileName);
insigniaNoteProfile.DocReceiveInsignia = doc;
}
insigniaNoteProfile.OrgReceiveInsignia = await _context.Organizations.Where(x => x.Id == req.OrgId).FirstOrDefaultAsync();
var root = _userProfileRepository.GetOc(req.OrgId, 0, AccessToken)?.Root ?? null;
if (req.OrgId != Guid.Parse("00000000-0000-0000-0000-000000000000"))
{
if (root == null)
return Error(GlobalMessages.OCNotFound, 404);
}
else
{
root = "สำนักนายกรัฐมนตรี";
}
insigniaNoteProfile.OrgReceiveInsignia = root;
insigniaNoteProfile.OrgReceiveInsigniaId = req.OrgId;
insigniaNoteProfile.DateReceiveInsignia = req.Date;
insigniaNoteProfile.LastUpdateFullName = FullName ?? "System Administrator";
insigniaNoteProfile.LastUpdateUserId = UserId ?? "";