add phnoe
Some checks failed
release-dev / release-dev (push) Failing after 11s

This commit is contained in:
kittapath 2025-01-16 17:55:07 +07:00
parent 2ece06d82c
commit 2095cd7fb4

View file

@ -1956,7 +1956,7 @@ namespace BMA.EHR.Placement.Service.Controllers
posLevelId = p.posLevelId == null ? string.Empty : p.posLevelId, posLevelId = p.posLevelId == null ? string.Empty : p.posLevelId,
posTypeId = p.posTypeId == null ? string.Empty : p.posTypeId, posTypeId = p.posTypeId == null ? string.Empty : p.posTypeId,
email = p.Email == null ? string.Empty : p.Email, email = p.Email == null ? string.Empty : p.Email,
phone = p.MobilePhone == null ? string.Empty : p.MobilePhone, phone = p.Telephone == null ? string.Empty : p.Telephone,
keycloak = string.Empty, keycloak = string.Empty,
isProbation = true, isProbation = true,
isLeave = false, isLeave = false,
@ -2795,7 +2795,7 @@ namespace BMA.EHR.Placement.Service.Controllers
return Error("ไม่พบหน่วยงานนี้ในระบบ", 404); return Error("ไม่พบหน่วยงานนี้ในระบบ", 404);
int no = 1; int no = 1;
foreach (var item in orgs.result.isRootTrue) foreach (var item in orgs.result.isRootTrue)
{ {
var placementProfiles = _context.PlacementProfiles var placementProfiles = _context.PlacementProfiles
@ -2974,7 +2974,7 @@ namespace BMA.EHR.Placement.Service.Controllers
var pa_slip = placementAppointments.FirstOrDefault(x => x.TypeCommand == "SLIP")?.Count ?? 0; var pa_slip = placementAppointments.FirstOrDefault(x => x.TypeCommand == "SLIP")?.Count ?? 0;
var pa_move = placementAppointments.FirstOrDefault(x => x.TypeCommand == "MOVE")?.Count ?? 0; var pa_move = placementAppointments.FirstOrDefault(x => x.TypeCommand == "MOVE")?.Count ?? 0;
data2 .Add(new data2.Add(new
{ {
no = no, no = no,
rootName = item.name, rootName = item.name,
@ -3004,7 +3004,7 @@ namespace BMA.EHR.Placement.Service.Controllers
date = $"ตั้งแต่วันที่ {startDate.Value.Date.ToThaiShortDate().ToThaiNumber()} ถึง {endDate.Value.Date.ToThaiShortDate().ToThaiNumber()}", date = $"ตั้งแต่วันที่ {startDate.Value.Date.ToThaiShortDate().ToThaiNumber()} ถึง {endDate.Value.Date.ToThaiShortDate().ToThaiNumber()}",
dateCurrent = $"ณ วันที่ {DateTime.Now.Date.ToThaiShortDate().ToThaiNumber()}", dateCurrent = $"ณ วันที่ {DateTime.Now.Date.ToThaiShortDate().ToThaiNumber()}",
data1, data1,
data1Count = new data1Count = new
{ {
pp_appoint = data1.Where(x => x.pp_appoint > 0).Sum(x => x.pp_appoint), pp_appoint = data1.Where(x => x.pp_appoint > 0).Sum(x => x.pp_appoint),
pp_slip = data1.Where(x => x.pp_slip > 0).Sum(x => x.pp_slip), pp_slip = data1.Where(x => x.pp_slip > 0).Sum(x => x.pp_slip),