From a0cc5b62ff0cba3f95dcd7953441124dee1586aa Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 30 Jan 2025 11:33:00 +0700
Subject: [PATCH] fixing field

---
 .../Reports/ProbationReportRepository.cs      |  4 ++--
 .../Responses/EvaluateResultAssignResponse.cs | 20 +++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs
index 57dd6284..8d55c8f5 100644
--- a/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs
+++ b/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs
@@ -949,8 +949,8 @@ namespace BMA.EHR.Application.Repositories.Reports
                         ChairmanPosition = string.IsNullOrEmpty(evaluate_assign.result.chairman.Position) ? string.Empty : evaluate_assign.result.chairman.Position,
                         ChairmanDate = string.IsNullOrEmpty(evaluate_assign.result.evaluate.chairman_dated.ToString()) ? "-" : evaluate_assign.result.evaluate?.chairman_dated?.ToThaiFullDate().ToString().ToThaiNumber(),
                         CommanderName = string.IsNullOrEmpty(evaluate_assign.result.commander.name) ? string.Empty : evaluate_assign.result.commander.name,
-                        CommanderPosition = string.IsNullOrEmpty(evaluate_assign.result.commander.Position) ? string.Empty : evaluate_assign.result.commander.Position,
-                        CommanderDate = string.IsNullOrEmpty(evaluate_assign.result.evaluate.director1_dated.ToString()) ? "-" : evaluate_assign.result.evaluate?.director1_dated?.ToThaiFullDate().ToString().ToThaiNumber(),
+                        CommanderPosition = string.IsNullOrEmpty(evaluate_assign.result.commander.position) ? string.Empty : evaluate_assign.result.commander.position,
+                        CommanderDate = string.IsNullOrEmpty(evaluate_assign.result.commander.dated.ToString()) ? "-" : evaluate_assign.result.commander.dated?.ToThaiFullDate().ToString().ToThaiNumber(),
                         Name = evaluate_assign.result.experimentee.name,
                         RoundNo = no.ToString().ToThaiNumber(),
                         DateStart = evaluate_assign.result.assign.date_start != string.Empty ? dateStart_ : "-",
diff --git a/BMA.EHR.Application/Responses/EvaluateResultAssignResponse.cs b/BMA.EHR.Application/Responses/EvaluateResultAssignResponse.cs
index ae940ec5..412e6bfc 100644
--- a/BMA.EHR.Application/Responses/EvaluateResultAssignResponse.cs
+++ b/BMA.EHR.Application/Responses/EvaluateResultAssignResponse.cs
@@ -19,15 +19,19 @@ namespace BMA.EHR.Application.Responses
 
         public class Commander
         {
-            public string personal_id { get; set; }
+            // public string personal_id { get; set; }
             public string name { get; set; }
-            public string PositionId { get; set; }
-            public string PositionLevelId { get; set; }
-            public string PositionLineId { get; set; }
-            public string Position { get; set; }
-            public string Department { get; set; }
-            public string OrganizationOrganization { get; set; }
-            public string Oc { get; set; }
+            // public string PositionId { get; set; }
+            // public string PositionLevelId { get; set; }
+            // public string PositionLineId { get; set; }
+            public string position { get; set; }
+            // public string Department { get; set; }
+            // public string OrganizationOrganization { get; set; }
+            // public string Oc { get; set; }
+            public DateTime? dated { get; set; }
+            public string posLevel { get; set; }
+            public string posType { get; set; }
+
         }
 
         public class Chairman