Merge branch 'develop' into work

BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs

@@ -202,6 +202,23 @@ namespace BMA.EHR.Application.Repositories.Reports
 
                 if (evaluate_assign.data != null)
                 {
+                    evaluate_assign.data.evaluate.achievement_score = evaluate_assign.data.evaluate.achievement_score.ToThaiNumber();
+                    evaluate_assign.data.evaluate.behavior_score = evaluate_assign.data.evaluate.behavior_score.ToThaiNumber();
+                    evaluate_assign.data.evaluate.sum_score = evaluate_assign.data.evaluate.sum_score.ToThaiNumber();
+                    evaluate_assign.data.evaluate.achievement_percent = evaluate_assign.data.evaluate.achievement_percent.ToThaiNumber();
+                    evaluate_assign.data.evaluate.behavior_percent = evaluate_assign.data.evaluate.behavior_percent.ToThaiNumber();
+                    evaluate_assign.data.evaluate.sum_percent = evaluate_assign.data.evaluate.sum_percent.ToThaiNumber();
+                    evaluate_assign.data.evaluate.develop_orientation_score = evaluate_assign.data.evaluate.develop_orientation_score.ToThaiNumber();
+                    evaluate_assign.data.evaluate.develop_self_learning_score = evaluate_assign.data.evaluate.develop_self_learning_score.ToThaiNumber();
+                    evaluate_assign.data.evaluate.develop_training_seminar_score = evaluate_assign.data.evaluate.develop_training_seminar_score.ToThaiNumber();
+                    evaluate_assign.data.evaluate.develop_other_training_score = evaluate_assign.data.evaluate.develop_other_training_score.ToThaiNumber();
+                    evaluate_assign.data.evaluate.develop_total_score = evaluate_assign.data.evaluate.develop_total_score.ToThaiNumber();
+                    evaluate_assign.data.evaluate.develop_orientation_percent = evaluate_assign.data.evaluate.develop_orientation_percent.ToThaiNumber();
+                    evaluate_assign.data.evaluate.develop_self_learning_percent = evaluate_assign.data.evaluate.develop_self_learning_percent.ToThaiNumber();
+                    evaluate_assign.data.evaluate.develop_training_seminar_percent = evaluate_assign.data.evaluate.develop_training_seminar_percent.ToThaiNumber();
+                    evaluate_assign.data.evaluate.develop_other_training_percent = evaluate_assign.data.evaluate.develop_other_training_percent.ToThaiNumber();
+                    evaluate_assign.data.evaluate.develop_total_percent = evaluate_assign.data.evaluate.develop_total_percent.ToThaiNumber();
+
                     return new
                     {
                         No = string.IsNullOrEmpty(evaluate_assign.data.evaluate.no.ToString()) ? string.Empty : evaluate_assign.data.evaluate.no.ToString().ToThaiNumber(),

BMA.EHR.Application/Responses/EvaluateChairmanAssignResponse.cs

@@ -105,26 +105,26 @@ namespace BMA.EHR.Application.Responses
             public DisciplineLevel discipline5_level { get; set; }
             public BehaviorLevel behavior_other_level { get; set; }
             public string behavior_other_desc { get; set; }
-            public int achievement_score { get; set; }
+            public string achievement_score { get; set; }
             public int achievement_score_total { get; set; }
-            public double achievement_percent { get; set; }
+            public string achievement_percent { get; set; }
             public int achievement_result { get; set; }
-            public int behavior_score { get; set; }
+            public string behavior_score { get; set; }
             public int behavior_score_total { get; set; }
-            public double behavior_percent { get; set; }
+            public string behavior_percent { get; set; }
             public int behavior_result { get; set; }
-            public int sum_score { get; set; }
-            public double sum_percent { get; set; }
-            public int develop_orientation_score { get; set; }
-            public int develop_self_learning_score { get; set; }
-            public int develop_training_seminar_score { get; set; }
-            public int develop_other_training_score { get; set; }
-            public int develop_total_score { get; set; }
-            public int develop_orientation_percent { get; set; }
-            public int develop_self_learning_percent { get; set; }
-            public int develop_training_seminar_percent { get; set; }
-            public int develop_other_training_percent { get; set; }
-            public int develop_total_percent { get; set; }
+            public string sum_score { get; set; }
+            public string sum_percent { get; set; }
+            public string develop_orientation_score { get; set; }
+            public string develop_self_learning_score { get; set; }
+            public string develop_training_seminar_score { get; set; }
+            public string develop_other_training_score { get; set; }
+            public string develop_total_score { get; set; }
+            public string develop_orientation_percent { get; set; }
+            public string develop_self_learning_percent { get; set; }
+            public string develop_training_seminar_percent { get; set; }
+            public string develop_other_training_percent { get; set; }
+            public string develop_total_percent { get; set; }
             public int develop_result { get; set; }
             public int evaluate_result { get; set; }
             public DateTime createdAt { get; set; }