From dba085d55a509e964489281a8fd15fa2ef916c09 Mon Sep 17 00:00:00 2001 From: kittapath Date: Sat, 11 Jan 2025 10:57:59 +0700 Subject: [PATCH 1/2] edit report probation --- .../Repositories/Reports/ProbationReportRepository.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs index 102c256d..8f552434 100644 --- a/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs @@ -124,6 +124,8 @@ namespace BMA.EHR.Application.Repositories.Reports Knowledges = knowledges, Competencys = competencys, Outputs = outputs, + Skills=skills, + Laws=laws, OtherDesc = string.IsNullOrEmpty(probation_assign.result.assign.other_desc) ? "-" : probation_assign.result.assign.other_desc, Other4Desc = string.IsNullOrEmpty(probation_assign.result.assign.other4_desc) ? "-" : probation_assign.result.assign.other4_desc, Other5No1Desc = string.IsNullOrEmpty(probation_assign.result.assign.other5_no1_desc) ? "-" : probation_assign.result.assign.other5_no1_desc, From 825fbf6a2d33499faa8a29a52b1dad8a6f58de91 Mon Sep 17 00:00:00 2001 From: kittapath Date: Sat, 11 Jan 2025 12:25:12 +0700 Subject: [PATCH 2/2] no message --- BMA.EHR.Placement.Service/Controllers/PlacementController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index dd75b93a..29139434 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -445,8 +445,8 @@ namespace BMA.EHR.Placement.Service.Controllers Education = x.PlacementEducations.Select(p => new { Id = p.Id, - EducationLevel = p.EducationLevelId, - EducationLevelId = p.EducationLevelName, + EducationLevel = p.EducationLevelName, + EducationLevelId = p.EducationLevelId, Institute = p.Institute, Degree = p.Degree, Field = p.Field,