From db84cdbf29cbec0909850b24630329d473d44892 Mon Sep 17 00:00:00 2001 From: moss <> Date: Fri, 30 May 2025 10:58:15 +0700 Subject: [PATCH] check type insignia --- .../Repositories/InsigniaPeriodsRepository.cs | 4 ++-- .../Reports/InsigniaReportRepository.cs | 18 +++++++++--------- .../Controllers/InsigniaRequestController.cs | 18 +++++++++--------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs b/BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs index 4353f6f6..70a41db4 100644 --- a/BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs +++ b/BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs @@ -9111,7 +9111,7 @@ namespace BMA.EHR.Application.Repositories LastUpdatedAt = DateTime.Now, // Add Information for reused in API Call - ProfileType = item.ProfileType ?? "officer", + ProfileType = item.ProfileType != null && item.ProfileType != "" ? item.ProfileType.ToLower() : "officer", Prefix = item.Prefix, FirstName = item.FirstName, LastName = item.LastName, @@ -9221,7 +9221,7 @@ namespace BMA.EHR.Application.Repositories LastUpdatedAt = DateTime.Now, // Add Information for reused in API Call - ProfileType = item.ProfileType ?? "officer", + ProfileType = item.ProfileType != null && item.ProfileType != "" ? item.ProfileType.ToLower() : "officer", Prefix = item.Prefix, FirstName = item.FirstName, LastName = item.LastName, diff --git a/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs index 68b1451f..3e7181eb 100644 --- a/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs @@ -1167,7 +1167,7 @@ namespace BMA.EHR.Application.Repositories.Reports if (matchedData != null) { resultList.Add(new - { + { rowNo = seq++.ToString().ToThaiNumber(), d.ProfileId, d.FullName, @@ -1342,10 +1342,10 @@ namespace BMA.EHR.Application.Repositories.Reports ResultOCT3 = d.ResultOCT3 ?? "-", ResultAPR4 = d.ResultAPR4 ?? "-", ResultOCT4 = d.ResultOCT4 ?? "-", - ResultAPR5 = d.ResultAPR5 ?? "-", + ResultAPR5 = d.ResultAPR5 ?? "-", ResultOCT5 = d.ResultOCT5 ?? "-", Remark = d.Reason ?? "-" - }); + }); } return resultList; @@ -1545,11 +1545,11 @@ namespace BMA.EHR.Application.Repositories.Reports if (type == "officer") { - data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToUpper() == "OFFICER"); + data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToLower() == "officer"); } else if (type == "employee") { - data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToUpper() == "EMPLOYEE"); + data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToLower() == "employee"); } switch (node) @@ -1618,11 +1618,11 @@ namespace BMA.EHR.Application.Repositories.Reports if (type == "officer") { - data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToUpper() == "OFFICER"); + data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToLower() == "officer"); } else if (type == "employee") { - data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToUpper() == "EMPLOYEE"); + data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToLower() == "employee"); } switch (node) @@ -1691,11 +1691,11 @@ namespace BMA.EHR.Application.Repositories.Reports if (type == "officer") { - data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToUpper() == "OFFICER"); + data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToLower() == "officer"); } else if (type == "employee") { - data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToUpper() == "EMPLOYEE"); + data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToLower() == "employee"); } switch (node) diff --git a/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs b/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs index d60bb2ff..b9a7cf48 100644 --- a/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs +++ b/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs @@ -334,7 +334,7 @@ namespace BMA.EHR.Insignia.Service.Controllers // // บันทึกรายชื่อ // await _repository.InsertCandidate(period, ocId, candidate); //} - if (role.Trim().ToUpper() == "OFFICER") + if (role.Trim().ToLower() == "officer") { resend.Items = (await _repository.InsigniaHasProfile(result.PeriodId, ocId, status, type)) .Where(x => x.ProfileType!.ToLower() == type.ToLower()).ToList(); @@ -453,7 +453,7 @@ namespace BMA.EHR.Insignia.Service.Controllers // // บันทึกรายชื่อ // await _repository.InsertCandidate(period, ocId, candidate); //} - if (role.Trim().ToUpper() == "OFFICER") + if (role.Trim().ToLower() == "officer") { resend.Items = await _repository.InsigniaHasProfile(result.PeriodId, ocId, status); return Success(resend); @@ -549,7 +549,7 @@ namespace BMA.EHR.Insignia.Service.Controllers } } - var resultData = candidates.Where(x => x.ProfileType == "EMPLOYEE").ToList(); + var resultData = candidates.Where(x => x.ProfileType == "employee").ToList(); //var resultData = allEmployeeProfileByRoot.Select(x => new //{ @@ -1168,7 +1168,7 @@ namespace BMA.EHR.Insignia.Service.Controllers LastUpdateUserId = UserId ?? "", LastUpdatedAt = DateTime.Now, // Add Information for reused in API Call - ProfileType = profile.ProfileType ?? "officer", + ProfileType = profile.ProfileType != null && profile.ProfileType != "" ? profile.ProfileType.ToLower() : "officer", Prefix = profile.Prefix, FirstName = profile.FirstName, LastName = profile.LastName, @@ -2139,7 +2139,7 @@ namespace BMA.EHR.Insignia.Service.Controllers { insigniaNoteProfile.Status = "DONE"; - if (profile.ProfileType == "OFFICER") + if (profile.ProfileType == "officer") { var profileInsigniaBody = new PostProfileInsigniaDto { @@ -2207,7 +2207,7 @@ namespace BMA.EHR.Insignia.Service.Controllers if (req.DateReceive != null && req.Date != null) { profileInsignia.Status = "DONE"; - if (profile.ProfileType == "OFFICER") + if (profile.ProfileType == "officer") { var profileInsigniaBody = new PostProfileInsigniaDto { @@ -2465,7 +2465,7 @@ namespace BMA.EHR.Insignia.Service.Controllers profile.Status = "DONE"; // check profile.ProfileType ก่อนส่งไประบบทะเบียนประวัติ - if (profile.ProfileType == "OFFICER") + if (profile.ProfileType == "officer") { var profileInsigniaBody = new PostProfileInsigniaDto { @@ -3170,11 +3170,11 @@ namespace BMA.EHR.Insignia.Service.Controllers foreach (var InsigniaRequest in insigniaPeriod.InsigniaRequests) { var profiles = await _context.Set() - .Where(p => p.Request.Id == InsigniaRequest.Id && p.ProfileType == req.type.Trim().ToUpper()).Select(x => x.ProfileId.ToString()).ToListAsync(); + .Where(p => p.Request.Id == InsigniaRequest.Id && p.ProfileType == req.type.Trim().ToLower()).Select(x => x.ProfileId.ToString()).ToListAsync(); if (profiles.Count > 0) { - await _insigniaPeriodRepository.UpdateInsigniaRequestProfile(profiles.ToArray(), req.type.Trim().ToUpper()); + await _insigniaPeriodRepository.UpdateInsigniaRequestProfile(profiles.ToArray(), req.type.Trim().ToLower()); } } }