From 42b1ae87fa92e3c848651de3a057a98f8f377728 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Fri, 8 Sep 2023 12:17:15 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20=E0=B8=9A?= =?UTF-8?q?=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B6=E0=B8=81=E0=B8=A7=E0=B8=B1?= =?UTF-8?q?=E0=B8=99=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=AA=E0=B8=A3=E0=B9=89?= =?UTF-8?q?=E0=B8=B2=E0=B8=87=20=E0=B8=9A=E0=B8=B1=E0=B8=99=E0=B8=97?= =?UTF-8?q?=E0=B8=B6=E0=B8=81=E0=B8=84=E0=B9=88=E0=B8=B2=E0=B8=9C=E0=B8=B4?= =?UTF-8?q?=E0=B8=94=E0=B8=9F=E0=B8=B4=E0=B8=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Repositories/InsigniaPeriodsRepository.cs | 8 +- .../MessageQueue/NotificationRepository.cs | 20 ++--- .../Models/Insignias/InsigniaPeriod.cs | 10 ++- .../BMA.EHR.Insignia.Service.csproj | 3 + .../Controllers/InsigniaManageController.cs | 12 +-- .../Controllers/InsigniaPeriodController.cs | 21 ++++- .../Controllers/InsigniaRequestController.cs | 40 +++++----- BMA.EHR.Insignia.Service/Program.cs | 8 ++ .../Services/NotifyService.cs | 77 +++++++++++++++++++ BMA.EHR.Insignia.Service/appsettings.json | 4 + .../OrganizationEmployeeController.cs | 24 +++--- .../Controllers/NotifyController.cs | 20 ++--- .../PlacementAppointmentController.cs | 8 +- .../Controllers/PlacementController.cs | 8 +- .../Controllers/PlacementOfficerController.cs | 4 +- .../Controllers/PlacementReceiveController.cs | 20 ++--- .../PlacementRelocationController.cs | 8 +- .../PlacementRepatriationController.cs | 4 +- .../PlacementTransferController.cs | 8 +- .../Controllers/RetirementController.cs | 24 +++--- .../RetirementDeceasedController.cs | 21 +++-- .../RetirementDischargeController.cs | 4 +- .../RetirementExpulsionController.cs | 4 +- .../Controllers/RetirementOtherController.cs | 8 +- .../Controllers/RetirementOutController.cs | 4 +- .../Controllers/RetirementResignController.cs | 16 ++-- 26 files changed, 252 insertions(+), 136 deletions(-) create mode 100644 BMA.EHR.Insignia.Service/Services/NotifyService.cs diff --git a/BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs b/BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs index 83dee0eb..e8c2a907 100644 --- a/BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs +++ b/BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs @@ -5144,8 +5144,8 @@ namespace BMA.EHR.Application.Repositories Organization = oc, RequestStatus = "st1", RequestNote = "", - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -5167,8 +5167,8 @@ namespace BMA.EHR.Application.Repositories Salary = item.Salary == null ? null : item.Salary, RequestDate = DateTime.Now, MatchingConditions = System.Text.Json.JsonSerializer.Serialize(item.MatchingConditions), // serialize to string - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", diff --git a/BMA.EHR.Application/Repositories/MessageQueue/NotificationRepository.cs b/BMA.EHR.Application/Repositories/MessageQueue/NotificationRepository.cs index ce045829..17d2eb9f 100644 --- a/BMA.EHR.Application/Repositories/MessageQueue/NotificationRepository.cs +++ b/BMA.EHR.Application/Repositories/MessageQueue/NotificationRepository.cs @@ -69,8 +69,8 @@ namespace BMA.EHR.Application.Repositories.MessageQueue ReceiverUserId = ReceiverUserId, Type = "", Payload = "", - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -85,8 +85,8 @@ namespace BMA.EHR.Application.Repositories.MessageQueue Body = Body, ReceiverUserId = ReceiverUserId, Payload = "", - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -101,12 +101,12 @@ namespace BMA.EHR.Application.Repositories.MessageQueue // ReceiverUserId = req.ReceiverUserId, // Type = "", // Payload = "", - // CreatedUserId = FullName ?? "", - // CreatedFullName = UserId ?? "System Administrator", - // CreatedAt = DateTime.Now, - // LastUpdateFullName = FullName ?? "System Administrator", - // LastUpdateUserId = UserId ?? "", - // LastUpdatedAt = DateTime.Now, + // CreatedUserId = UserId ?? "System Administrator", + // CreatedFullName = FullName ?? "", + // CreatedAt = DateTime.Now, + // LastUpdateFullName = FullName ?? "System Administrator", + // LastUpdateUserId = UserId ?? "", + // LastUpdatedAt = DateTime.Now, // }); } await _dbContext.SaveChangesAsync(); diff --git a/BMA.EHR.Domain/Models/Insignias/InsigniaPeriod.cs b/BMA.EHR.Domain/Models/Insignias/InsigniaPeriod.cs index 65a2c307..8740b083 100644 --- a/BMA.EHR.Domain/Models/Insignias/InsigniaPeriod.cs +++ b/BMA.EHR.Domain/Models/Insignias/InsigniaPeriod.cs @@ -8,15 +8,19 @@ namespace BMA.EHR.Domain.Models.Insignias { public class InsigniaPeriod : EntityBase { - [MaxLength(200)] + [MaxLength(200), Comment("ชื่อรอบเสนอขอเครื่องราชฯ")] public string? Name { get; set; } + [Comment("ปี")] public int Year { get; set; } + [Comment("วันที่เริ่ม")] public DateTime StartDate { get; set; } + [Comment("วันที่สิ้นสุด")] public DateTime EndDate { get; set; } - [MaxLength(50)] + [MaxLength(50), Comment("จำนวนวันแจ้งเตือนล่วงหน้า")] public int Amount { get; set; } - [MaxLength(10)] + [MaxLength(10), Comment("ประเภทการขอ")] public string? Type { get; set; } + [Comment("Fk table Document")] public Document? ReliefDoc { get; set; } [Comment("ราบการยื่นขอ")] public int Round { get; set; } = 1; diff --git a/BMA.EHR.Insignia.Service/BMA.EHR.Insignia.Service.csproj b/BMA.EHR.Insignia.Service/BMA.EHR.Insignia.Service.csproj index ac60c4fc..738fb6d2 100644 --- a/BMA.EHR.Insignia.Service/BMA.EHR.Insignia.Service.csproj +++ b/BMA.EHR.Insignia.Service/BMA.EHR.Insignia.Service.csproj @@ -12,6 +12,9 @@ + + + diff --git a/BMA.EHR.Insignia.Service/Controllers/InsigniaManageController.cs b/BMA.EHR.Insignia.Service/Controllers/InsigniaManageController.cs index 0bdd7277..c793201e 100644 --- a/BMA.EHR.Insignia.Service/Controllers/InsigniaManageController.cs +++ b/BMA.EHR.Insignia.Service/Controllers/InsigniaManageController.cs @@ -146,8 +146,8 @@ namespace BMA.EHR.Insignia.Service.Controllers Insignia = insignia, Year = req.Year, Total = req.Total, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -291,8 +291,8 @@ namespace BMA.EHR.Insignia.Service.Controllers OrganizationOrganization = organization.OrganizationOrganization, Total = req.Total, InsigniaManage = insigniaManage, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -448,8 +448,8 @@ namespace BMA.EHR.Insignia.Service.Controllers BorrowOrganization = organization.OrganizationOrganization, BorrowDate = req.BorrowDate, InsigniaNoteProfile = insigniaNoteProfile, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", diff --git a/BMA.EHR.Insignia.Service/Controllers/InsigniaPeriodController.cs b/BMA.EHR.Insignia.Service/Controllers/InsigniaPeriodController.cs index 16a3c496..36eccf03 100644 --- a/BMA.EHR.Insignia.Service/Controllers/InsigniaPeriodController.cs +++ b/BMA.EHR.Insignia.Service/Controllers/InsigniaPeriodController.cs @@ -180,8 +180,8 @@ namespace BMA.EHR.Insignia.Service.Controllers EndDate = req.EndDate, Amount = req.Amount, IsActive = true, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -290,5 +290,22 @@ namespace BMA.EHR.Insignia.Service.Controllers return Success(); } + + public async Task NotifyInsignia() + { + var insigniaPeriods = await _context.InsigniaPeriods.AsQueryable() + .ToListAsync(); + foreach (var insigniaPeriod in insigniaPeriods) + { + if (insigniaPeriod.StartDate.AddDays(-insigniaPeriod.Amount).Date == DateTime.Now.Date) + { + await _repositoryNoti.PushNotificationAsync( + Guid.Parse("08db721d-ae67-4ed1-8b3c-490f44a73e65"), + $"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round}", + $"แจ้งเตือนรอบการเสนอขอ {insigniaPeriod.Name} รอบที่{insigniaPeriod.Round}" + ); + } + } + } } } \ No newline at end of file diff --git a/BMA.EHR.Insignia.Service/Controllers/InsigniaRequestController.cs b/BMA.EHR.Insignia.Service/Controllers/InsigniaRequestController.cs index b88d5b30..ac09df71 100644 --- a/BMA.EHR.Insignia.Service/Controllers/InsigniaRequestController.cs +++ b/BMA.EHR.Insignia.Service/Controllers/InsigniaRequestController.cs @@ -976,8 +976,8 @@ namespace BMA.EHR.Insignia.Service.Controllers Organization = org, RequestStatus = "st1", RequestNote = "", - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -993,8 +993,8 @@ namespace BMA.EHR.Insignia.Service.Controllers Request = insigniaRequest, RequestDate = DateTime.Now, MatchingConditions = System.Text.Json.JsonSerializer.Serialize(new List()), // serialize to string - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -1067,8 +1067,8 @@ namespace BMA.EHR.Insignia.Service.Controllers // EndDate = insigniaPeriod.EndDate, // Amount = insigniaPeriod.Amount, // ReliefDoc = insigniaPeriod.ReliefDoc, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -1108,8 +1108,8 @@ namespace BMA.EHR.Insignia.Service.Controllers noreProfileOld.Salary = profileOld.Salary; noreProfileOld.IsApprove = profileOld.IsApprove; noreProfileOld.RequestInsignia = profileOld.RequestInsignia; - noreProfileOld.CreatedUserId = FullName ?? ""; - noreProfileOld.CreatedFullName = UserId ?? "System Administrator"; + noreProfileOld.CreatedUserId = UserId ?? "System Administrator"; + noreProfileOld.CreatedFullName = FullName ?? ""; noreProfileOld.CreatedAt = DateTime.Now; noreProfileOld.LastUpdateFullName = FullName ?? "System Administrator"; noreProfileOld.LastUpdateUserId = UserId ?? ""; @@ -1129,8 +1129,8 @@ namespace BMA.EHR.Insignia.Service.Controllers RequestInsignia = profileOld.RequestInsignia, OrganizationOrganizationSend = profileOld.Profile == null || profileOld.Profile.OcId == null ? null : FindOCFullPath(profileOld.Profile.OcId.Value, true), InsigniaNote = insigniaNote, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -1424,8 +1424,8 @@ namespace BMA.EHR.Insignia.Service.Controllers OrganizationOrganizationReceive = req.OrganizationOrganizationReceive, OrganizationOrganizationSend = req.OrganizationOrganizationSend, InsigniaNote = insigniaNote, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -1450,8 +1450,8 @@ namespace BMA.EHR.Insignia.Service.Controllers // RefCommandNo = req.RefCommandNo, // RefCommandDate = req.RefCommandDate, Profile = profile, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -1498,8 +1498,8 @@ namespace BMA.EHR.Insignia.Service.Controllers // RefCommandNo = req.RefCommandNo, // RefCommandDate = req.RefCommandDate, Profile = profile, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -1545,8 +1545,8 @@ namespace BMA.EHR.Insignia.Service.Controllers Reason = req.Reason, Document = _doc, InsigniaNote = insigniaNote, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -1701,8 +1701,8 @@ namespace BMA.EHR.Insignia.Service.Controllers // RefCommandNo = req.RefCommandNo, // RefCommandDate = req.RefCommandDate, Profile = profile.Profile, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", diff --git a/BMA.EHR.Insignia.Service/Program.cs b/BMA.EHR.Insignia.Service/Program.cs index c27d5942..ce9a1098 100644 --- a/BMA.EHR.Insignia.Service/Program.cs +++ b/BMA.EHR.Insignia.Service/Program.cs @@ -3,6 +3,9 @@ using BMA.EHR.Domain.Middlewares; using BMA.EHR.Infrastructure; using BMA.EHR.Infrastructure.Persistence; using BMA.EHR.Insignia.Service; +using BMA.EHR.Insignia.Service.Controllers; +using Hangfire; +using Hangfire.Common; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.ApiExplorer; @@ -120,6 +123,11 @@ var app = builder.Build(); app.UseStaticFiles(); app.MapControllers(); app.UseMiddleware(); + var manager = new RecurringJobManager(); + if (manager != null) + { + manager.AddOrUpdate("SendNotifyFirstRound", Job.FromExpression(x => x.NotifyInsignia()), Cron.Daily(Int32.Parse(builder.Configuration["KeycloakCron:Hour"]), Int32.Parse(builder.Configuration["KeycloakCron:Minute"])), TimeZoneInfo.Local); + } // apply migrations await using var scope = app.Services.CreateAsyncScope(); diff --git a/BMA.EHR.Insignia.Service/Services/NotifyService.cs b/BMA.EHR.Insignia.Service/Services/NotifyService.cs new file mode 100644 index 00000000..920b2443 --- /dev/null +++ b/BMA.EHR.Insignia.Service/Services/NotifyService.cs @@ -0,0 +1,77 @@ +// using System.Net.Http.Headers; +// using BMA.EHR.Domain.Extensions; +// using Microsoft.EntityFrameworkCore; +// using Newtonsoft.Json; + +// namespace BMA.EHR.Insignia.Service.Services +// { +// public class NotifyService +// { +// private readonly ApplicationDbContext _context; +// private readonly IHttpContextAccessor _httpContextAccessor; +// private readonly IConfiguration _configuration; +// private readonly AppointmentService _serviceAppoint; +// private readonly AppointmentReserveLineService _serviceAppointRe; +// public NotifyService(ApplicationDbContext context, IHttpContextAccessor httpContextAccessor, IConfiguration configuration, AppointmentService serviceAppoint, AppointmentReserveLineService serviceAppointRe) : base(httpContextAccessor) +// { +// _context = context; +// _httpContextAccessor = httpContextAccessor; +// _configuration = configuration; +// _serviceAppoint = serviceAppoint; +// _serviceAppointRe = serviceAppointRe; +// } +// public async Task notiAppointments() +// { +// Console.WriteLine("++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"); +// var data = await _context.Tb15AppointmentReserve.Where(x => x.AppointDate.ToDateTime(x.AppointTimeStart).Date == DateTime.Now.AddDays(1).Date).ToListAsync(); +// foreach (var _data in data) +// { +// var message = new +// { +// type = "text", +// text = $"เรียน อาสาสมัคร\n พรุ่งนี้ท่านมีนัดกับโครงการศิริราชวันเฮลท์ที่ ชั้น 1 ตึกศูนย์วิจัยการแพทย์ศิริราช (SiMR) โครงการดำเนินการ เวลา {(_data.AppointDate).ToDateTime(_data.AppointTimeStart).ToShortTimeString()} - {(_data.AppointDate).ToDateTime(_data.AppointTimeEnd).ToShortTimeString()} น. ขอความกรุณา ดังนี้\n 1. 'ไม่ต้องงด' อาหารและเครื่องดื่ม\nท่านจะได้รับการตรวจน้ำตาลสะสม (A1C) และอื่น ๆ ตามปกติ ยกเว้น น้ำตาลในเลือดและอินซูลิน\n 2. ทำแบบสอบถาม ที่แถบเมนู “ทำแบบสอบถาม” ให้ครบ\n 3. แจ้งชื่อ-นามสกุล ณ จุดลงทะเบียน และแจ้งสถานะการเข้าร่วมโครงการจีโนมิกส์ประเทศไทย (จากรูปที่แคปไว้)\n 4. ดำเนินกิจกรรมทั้งหมด 6 ฐาน\n*เนื่องจากมีการวัดองค์ประกอบร่างกายด้วยเครื่อง BIA รบกวนหลีกเลี่ยงการใส่เครื่องประดับที่มีโลหะ\n\nหลังวันนัด\n 1. อาสาสมัครที่ผ่านเกณฑ์การตรวจอุจจาระ เจ้าหน้าที่จะติดต่อเพื่อนัดรับอุปกรณ์อีกครั้ง\n 2. เจ้าหน้าที่จะแจ้งผลตรวจตามที่อาสาสมัครตรวจจริงภายใน 2-3 เดือน" +// }; +// if (_data.AppointTimeStart == TimeOnly.Parse("08:00")) +// { +// message = new +// { +// type = "text", +// text = $"เรียน อาสาสมัคร\n พรุ่งนี้ท่านมีนัดกับโครงการศิริราชวันเฮลท์ที่ ชั้น 1 ตึกศูนย์วิจัยการแพทย์ศิริราช (SiMR) โครงการดำเนินการ เวลา {(_data.AppointDate).ToDateTime(_data.AppointTimeStart).ToShortTimeString()} - {(_data.AppointDate).ToDateTime(_data.AppointTimeEnd).ToShortTimeString()} น. ขอความกรุณา ดังนี้\n 1. งดอาหารและเครื่องดื่ม ยกเว้นน้ำเปล่า หลังเที่ยงคืน (หากท่านไม่สะดวกงดอาหาร ท่านจะไม่ได้รับการตรวจน้ำตาลในเลือดและอินซูลิน)\n 2. ทำแบบสอบถาม ที่แถบเมนู “ทำแบบสอบถาม” ให้ครบ\n 3. แจ้งชื่อ-นามสกุล ณ จุดลงทะเบียน และแจ้งสถานะการเข้าร่วมโครงการจีโนมิกส์ประเทศไทย (จากรูปที่แคปไว้)\n 4. ดำเนินกิจกรรมทั้งหมด 6 ฐาน\n*เนื่องจากมีการวัดองค์ประกอบร่างกายด้วยเครื่อง BIA รบกวนหลีกเลี่ยงการใส่เครื่องประดับที่มีโลหะ\n\nหลังวันนัด\n 1. อาสาสมัครที่ผ่านเกณฑ์การตรวจอุจจาระ เจ้าหน้าที่จะติดต่อเพื่อนัดรับอุปกรณ์อีกครั้ง\n 2. เจ้าหน้าที่จะแจ้งผลตรวจตามที่อาสาสมัครตรวจจริงภายใน 2-3 เดือน" +// }; +// } +// else if (_data.AppointTimeStart == TimeOnly.Parse("09:00")) +// { +// message = new +// { +// type = "text", +// text = $"เรียน อาสาสมัคร\n พรุ่งนี้ท่านมีนัดกับโครงการศิริราชวันเฮลท์ที่ ชั้น 1 ตึกศูนย์วิจัยการแพทย์ศิริราช (SiMR) โครงการดำเนินการ เวลา {(_data.AppointDate).ToDateTime(_data.AppointTimeStart).ToShortTimeString()} - {(_data.AppointDate).ToDateTime(_data.AppointTimeEnd).ToShortTimeString()} น. ขอความกรุณา ดังนี้\n 1. 'ไม่ต้องงด' อาหารและเครื่องดื่ม\nท่านจะได้รับการตรวจน้ำตาลสะสม (A1C) และอื่น ๆ ตามปกติ ยกเว้น น้ำตาลในเลือดและอินซูลิน\n 2. ทำแบบสอบถาม ที่แถบเมนู “ทำแบบสอบถาม” ให้ครบ\n 3. แจ้งชื่อ-นามสกุล ณ จุดลงทะเบียน และแจ้งสถานะการเข้าร่วมโครงการจีโนมิกส์ประเทศไทย (จากรูปที่แคปไว้)\n 4. ดำเนินกิจกรรมทั้งหมด 6 ฐาน\n*เนื่องจากมีการวัดองค์ประกอบร่างกายด้วยเครื่อง BIA รบกวนหลีกเลี่ยงการใส่เครื่องประดับที่มีโลหะ\n\nหลังวันนัด\n 1. อาสาสมัครที่ผ่านเกณฑ์การตรวจอุจจาระ เจ้าหน้าที่จะติดต่อเพื่อนัดรับอุปกรณ์อีกครั้ง\n 2. เจ้าหน้าที่จะแจ้งผลตรวจตามที่อาสาสมัครตรวจจริงภายใน 2-3 เดือน" +// }; +// } +// Object[] messageArray = new Object[] { message }; + +// var profile = await _context.Tb1Profile.FirstOrDefaultAsync(x => x.UserId == _data.UserId); +// if (profile != null && profile.LineId != null) +// { +// var result = new +// { +// to = profile.LineId, +// messages = messageArray +// }; +// using (var client = new HttpClient()) +// { +// var json = JsonConvert.SerializeObject(result); +// var _result = new StringContent(json, null, "application/json"); +// var url = "https://api.line.me/v2/bot/message/push"; +// // //HTTP POST +// client.DefaultRequestHeaders.Authorization +// = new AuthenticationHeaderValue("Bearer", _configuration["ACCESS_TOKEN"]); +// var responseTask = client.PostAsync(url, _result); +// var results = responseTask.Result; +// // Console.WriteLine(results.Content.ReadAsStringAsync().Result); +// } +// } +// } +// return data; +// } +// } +// } diff --git a/BMA.EHR.Insignia.Service/appsettings.json b/BMA.EHR.Insignia.Service/appsettings.json index fb704a6c..ef04dc73 100644 --- a/BMA.EHR.Insignia.Service/appsettings.json +++ b/BMA.EHR.Insignia.Service/appsettings.json @@ -31,5 +31,9 @@ "SecretKey": "FPTadmin2357", "BucketName": "bma-ehr-fpt" }, + "KeycloakCron": { + "Hour": "15", + "Minute": "00" + }, "Protocol": "HTTPS" } diff --git a/BMA.EHR.OrganizationEmployee.Service/Controllers/OrganizationEmployeeController.cs b/BMA.EHR.OrganizationEmployee.Service/Controllers/OrganizationEmployeeController.cs index 59d8b401..42dbb5b4 100644 --- a/BMA.EHR.OrganizationEmployee.Service/Controllers/OrganizationEmployeeController.cs +++ b/BMA.EHR.OrganizationEmployee.Service/Controllers/OrganizationEmployeeController.cs @@ -179,8 +179,8 @@ namespace BMA.EHR.OrganizationEmployee.Service.Controllers var _data = new OrganizationPositionEmployeeLevel { PositionEmployeeLevel = await _context.PositionEmployeeLevels.FindAsync(p), - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -194,8 +194,8 @@ namespace BMA.EHR.OrganizationEmployee.Service.Controllers var _data = new OrganizationPositionEmployeePositionSide { PositionEmployeePositionSide = await _context.PositionEmployeePositionSides.FindAsync(p), - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -234,8 +234,8 @@ namespace BMA.EHR.OrganizationEmployee.Service.Controllers OrganizationShortName = await _context.OrganizationShortNames.FindAsync(req.OrganizationShortNameId), OrganizationPositionEmployeeLevels = positionEmployeeLevel, OrganizationPositionEmployeePositionSides = positionEmployeePositionSide, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -266,8 +266,8 @@ namespace BMA.EHR.OrganizationEmployee.Service.Controllers var _data = new OrganizationPositionEmployeeLevel { PositionEmployeeLevel = await _context.PositionEmployeeLevels.FindAsync(p), - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -281,8 +281,8 @@ namespace BMA.EHR.OrganizationEmployee.Service.Controllers var _data = new OrganizationPositionEmployeePositionSide { PositionEmployeePositionSide = await _context.PositionEmployeePositionSides.FindAsync(p), - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -438,8 +438,8 @@ namespace BMA.EHR.OrganizationEmployee.Service.Controllers OrgEmployee = organizationEmployee, Profile = profile, Status = "PENDING", - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", diff --git a/BMA.EHR.Placement.Service/Controllers/NotifyController.cs b/BMA.EHR.Placement.Service/Controllers/NotifyController.cs index 41b5ad3f..5e7ad384 100644 --- a/BMA.EHR.Placement.Service/Controllers/NotifyController.cs +++ b/BMA.EHR.Placement.Service/Controllers/NotifyController.cs @@ -63,8 +63,8 @@ namespace BMA.EHR.Placement.Service.Controllers ReceiverUserId = req.ReceiverUserId, Type = "", Payload = "", - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -79,8 +79,8 @@ namespace BMA.EHR.Placement.Service.Controllers Body = req.Body, ReceiverUserId = req.ReceiverUserId, Payload = "", - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -95,12 +95,12 @@ namespace BMA.EHR.Placement.Service.Controllers // ReceiverUserId = req.ReceiverUserId, // Type = "", // Payload = "", - // CreatedUserId = FullName ?? "", - // CreatedFullName = UserId ?? "System Administrator", - // CreatedAt = DateTime.Now, - // LastUpdateFullName = FullName ?? "System Administrator", - // LastUpdateUserId = UserId ?? "", - // LastUpdatedAt = DateTime.Now, + // CreatedUserId = UserId ?? "System Administrator", + // CreatedFullName = FullName ?? "", + // CreatedAt = DateTime.Now, + // LastUpdateFullName = FullName ?? "System Administrator", + // LastUpdateUserId = UserId ?? "", + // LastUpdatedAt = DateTime.Now, // }); } await _context.SaveChangesAsync(); diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs index cc43d899..919dac3a 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs @@ -265,8 +265,8 @@ namespace BMA.EHR.Placement.Service.Controllers PositionNumberOld = profile.PosNo == null ? null : profile.PosNo.Name, OrganizationPositionOld = profile.Position == null ? profile.Oc : $"{profile.Position.Name}-{profile.Oc}", Status = "WAITTING", - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -289,8 +289,8 @@ namespace BMA.EHR.Placement.Service.Controllers { PlacementAppointment = placementAppointment, Document = _doc, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index 97745619..75263377 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -909,8 +909,8 @@ namespace BMA.EHR.Placement.Service.Controllers IssueDate = req.IssueDate, ExpireDate = req.ExpireDate, CertificateType = req.CertificateType, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -997,8 +997,8 @@ namespace BMA.EHR.Placement.Service.Controllers FinishDate = req.FinishDate, StartDate = req.StartDate, EndDate = req.EndDate, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs index 441b51ec..8fec9127 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs @@ -198,8 +198,8 @@ namespace BMA.EHR.Placement.Service.Controllers PositionNumberOld = profile.PosNo == null ? null : profile.PosNo.Name, OrganizationPositionOld = profile.Position == null ? profile.Oc : $"{profile.Position.Name}-{profile.Oc}", Status = "WAITTING", - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs index df04501a..4c9364da 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs @@ -264,8 +264,8 @@ namespace BMA.EHR.Placement.Service.Controllers PositionNumberOld = profile.PosNo == null ? null : profile.PosNo.Name, OrganizationPositionOld = profile.Position == null ? profile.Oc : $"{profile.Position.Name}-{profile.Oc}", Status = "WAITTING", - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -289,12 +289,12 @@ namespace BMA.EHR.Placement.Service.Controllers // { // PlacementReceive = placementReceive, // Document = _doc, - // CreatedUserId = FullName ?? "", - // CreatedFullName = UserId ?? "System Administrator", - // CreatedAt = DateTime.Now, - // LastUpdateFullName = FullName ?? "System Administrator", - // LastUpdateUserId = UserId ?? "", - // LastUpdatedAt = DateTime.Now, + // CreatedUserId = UserId ?? "System Administrator", + // CreatedFullName = FullName ?? "", + // CreatedAt = DateTime.Now, + // LastUpdateFullName = FullName ?? "System Administrator", + // LastUpdateUserId = UserId ?? "", + // LastUpdatedAt = DateTime.Now, // }; // await _context.PlacementReceiveDocs.AddAsync(placementReceiveDoc); placementReceive.Avatar = _doc; @@ -352,8 +352,8 @@ namespace BMA.EHR.Placement.Service.Controllers { PlacementReceive = uppdated, Document = _doc, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementRelocationController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementRelocationController.cs index 1a92a267..68aaaa1b 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementRelocationController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementRelocationController.cs @@ -262,8 +262,8 @@ namespace BMA.EHR.Placement.Service.Controllers PositionNumberOld = profile.PosNo == null ? null : profile.PosNo.Name, OrganizationPositionOld = profile.Position == null ? profile.Oc : $"{profile.Position.Name}-{profile.Oc}", Status = "WAITTING", - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -286,8 +286,8 @@ namespace BMA.EHR.Placement.Service.Controllers { PlacementRelocation = placementRelocation, Document = _doc, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs index 9c403962..02fa4cdb 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs @@ -195,8 +195,8 @@ namespace BMA.EHR.Placement.Service.Controllers PositionNumberOld = profile.PosNo == null ? null : profile.PosNo.Name, OrganizationPositionOld = profile.Position == null ? profile.Oc : $"{profile.Position.Name}-{profile.Oc}", Status = "WAITTING", - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs index f327f823..357bee88 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs @@ -336,8 +336,8 @@ namespace BMA.EHR.Placement.Service.Controllers PositionNumberOld = profile.PosNo == null ? null : profile.PosNo.Name, OrganizationPositionOld = profile.Position == null ? profile.Oc : $"{profile.Position.Name}-{profile.Oc}", Status = "WAITTING", - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -360,8 +360,8 @@ namespace BMA.EHR.Placement.Service.Controllers { PlacementTransfer = placementTransfer, Document = _doc, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs index a17e8524..d9ab938d 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs @@ -233,8 +233,8 @@ namespace BMA.EHR.Retirement.Service.Controllers TypeReport = null, Type = req.Type.Trim().ToUpper(), Year = req.Year, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -255,8 +255,8 @@ namespace BMA.EHR.Retirement.Service.Controllers Remove = "PENDING", RetirementPeriod = retire, Profile = profile, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -311,8 +311,8 @@ namespace BMA.EHR.Retirement.Service.Controllers Document = retire.Document, Total = retire.RetirementProfiles.Count(), ProfileFile = file_name, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -357,8 +357,8 @@ namespace BMA.EHR.Retirement.Service.Controllers Remove = "PENDING", RetirementPeriod = retire, Profile = _profile, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -389,8 +389,8 @@ namespace BMA.EHR.Retirement.Service.Controllers Remove = "PENDING", RetirementPeriod = retire, Profile = profileOld.Profile, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -564,8 +564,8 @@ namespace BMA.EHR.Retirement.Service.Controllers Remove = "PENDING", RetirementPeriod = retire, Profile = profile, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs index 73069b36..b45904d3 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs @@ -237,8 +237,8 @@ namespace BMA.EHR.Retirement.Service.Controllers Location = req.Location, Reason = req.Reason, IsActive = true, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -268,8 +268,8 @@ namespace BMA.EHR.Retirement.Service.Controllers CommandTypeName = "-", SalaryStatus = "DEATH", Profile = profile, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -283,8 +283,8 @@ namespace BMA.EHR.Retirement.Service.Controllers CategoryName = "DEATH", Document = _doc, Profile = profile, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -320,13 +320,12 @@ namespace BMA.EHR.Retirement.Service.Controllers OrganizationName = orgPos!.OrganizationPosition!.Organization!.OrganizationOrganization!.Name, PositionName = orgPos!.OrganizationPosition!.PositionMaster!.PositionPath!.Name, ReceiveUser = profile, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", LastUpdatedAt = DateTime.Now, - }); } } @@ -475,8 +474,8 @@ namespace BMA.EHR.Retirement.Service.Controllers OrganizationName = profile.OrganizationOrganization == null ? "" : profile.OrganizationOrganization, PositionName = profile.Position == null ? null : profile.Position.Name, ReceiveUser = profile, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementDischargeController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementDischargeController.cs index 65b294a3..b3bec6b5 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementDischargeController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementDischargeController.cs @@ -195,8 +195,8 @@ namespace BMA.EHR.Retirement.Service.Controllers PositionNumberOld = profile.PosNo == null ? null : profile.PosNo.Name, OrganizationPositionOld = profile.Position == null ? profile.Oc : $"{profile.Position.Name}-{profile.Oc}", Status = "WAITTING", - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementExpulsionController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementExpulsionController.cs index 72e3cfb6..797a5588 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementExpulsionController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementExpulsionController.cs @@ -195,8 +195,8 @@ namespace BMA.EHR.Retirement.Service.Controllers PositionNumberOld = profile.PosNo == null ? null : profile.PosNo.Name, OrganizationPositionOld = profile.Position == null ? profile.Oc : $"{profile.Position.Name}-{profile.Oc}", Status = "WAITTING", - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs index 194e17b0..e9d31067 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs @@ -265,8 +265,8 @@ namespace BMA.EHR.Retirement.Service.Controllers PositionNumberOld = profile.PosNo == null ? null : profile.PosNo.Name, OrganizationPositionOld = profile.Position == null ? profile.Oc : $"{profile.Position.Name}-{profile.Oc}", Status = "WAITTING", - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -289,8 +289,8 @@ namespace BMA.EHR.Retirement.Service.Controllers { RetirementOther = retirementOther, Document = _doc, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs index 5d8549a3..dd17008c 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs @@ -195,8 +195,8 @@ namespace BMA.EHR.Retirement.Service.Controllers PositionNumberOld = profile.PosNo == null ? null : profile.PosNo.Name, OrganizationPositionOld = profile.Position == null ? profile.Oc : $"{profile.Position.Name}-{profile.Oc}", Status = "WAITTING", - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs index 5bf41c4f..137900f2 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs @@ -316,8 +316,8 @@ namespace BMA.EHR.Retirement.Service.Controllers OrganizationPositionOld = profile.Position == null ? profile.Oc : $"{profile.Position.Name}-{profile.Oc}", Status = "WAITTING", IsActive = true, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -340,8 +340,8 @@ namespace BMA.EHR.Retirement.Service.Controllers { RetirementResign = retirementResign, Document = _doc, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "", @@ -497,6 +497,8 @@ namespace BMA.EHR.Retirement.Service.Controllers public async Task> CommanderConfirm([FromBody] RetirementReasonRequest req, Guid id) { var updated = await _context.RetirementResigns + .Include(x => x.Profile) + .ThenInclude(x => x.Prefix) .FirstOrDefaultAsync(x => x.Id == id); if (updated == null) return Error(GlobalMessages.RetirementResignNotFound, 404); @@ -530,6 +532,8 @@ namespace BMA.EHR.Retirement.Service.Controllers public async Task> CommanderReject([FromBody] RetirementReasonDateRequest req, Guid id) { var updated = await _context.RetirementResigns + .Include(x => x.Profile) + .ThenInclude(x => x.Prefix) .FirstOrDefaultAsync(x => x.Id == id); if (updated == null) return Error(GlobalMessages.RetirementResignNotFound, 404); @@ -809,8 +813,8 @@ namespace BMA.EHR.Retirement.Service.Controllers FutureWork = req.FutureWork, FutureWorkReason = req.FutureWorkReason, Suggestion = req.Suggestion, - CreatedUserId = FullName ?? "", - CreatedFullName = UserId ?? "System Administrator", + CreatedUserId = UserId ?? "System Administrator", + CreatedFullName = FullName ?? "", CreatedAt = DateTime.Now, LastUpdateFullName = FullName ?? "System Administrator", LastUpdateUserId = UserId ?? "",