From 294fc7942578e41d85a98bf5e5c6cfc7c8005d9f Mon Sep 17 00:00:00 2001 From: kittapath Date: Fri, 10 Jan 2025 16:51:04 +0700 Subject: [PATCH] no message --- .../Reports/ProbationReportRepository.cs | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs index 68857412..29de906b 100644 --- a/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs @@ -148,12 +148,8 @@ namespace BMA.EHR.Application.Repositories.Reports var training_seminar = evaluate_record.result.evaluate.training_seminar == "1" ? "🗹 ดำเนินการแล้ว ☐ ยังไม่ได้ดำเนินการ" : "☐ ดำเนินการแล้ว 🗹 ยังไม่ได้ดำเนินการ"; var other_training = evaluate_record.result.evaluate.other_training == "1" ? "🗹 ดำเนินการแล้ว ☐ ยังไม่ได้ดำเนินการ" : "☐ ดำเนินการแล้ว 🗹 ยังไม่ได้ดำเนินการ"; - var expects = evaluate_record.result.evaluate != null && evaluate_record.result.evaluate.achievements.evaluate_expect_level - ? evaluate_record.result.evaluate.achievements.evaluate_expect_level - : null; - var outputs = evaluate_record.result.evaluate != null && evaluate_record.result.evaluate.achievements.evaluate_output_level - ? evaluate_record.result.evaluate.achievements.evaluate_output_level - : null; + var expects = evaluate_record?.result?.evaluate?.achievements?.evaluate_expect_level ?? null; + var outputs = evaluate_record?.result?.evaluate?.achievements?.evaluate_output_level ?? null; var knows = evaluate_record.result.evaluate != null ? new { @@ -363,13 +359,7 @@ namespace BMA.EHR.Application.Repositories.Reports EvaluateDateFinish = string.IsNullOrEmpty(evaluate_record.result.evaluate.date_finish.ToString()) ? string.Empty : evaluate_record.result.evaluate.date_finish.ToThaiFullDate().ToString().ToThaiNumber(), Role = evaluate_record.result.evaluate.role == "mentor" ? "ผู้ดูแลการทดลองปฏิบัติหน้าที่ราชการ" : "ผู้บังคับบัญชา", Expects = expects, - ExpectDesc = evaluate_record.result.evaluate != null && evaluate_record.result.evaluate.achievements.Count > 0 - ? evaluate_record.result.evaluate.achievements[0].evaluate_expect_desc - : string.Empty, Outputs = outputs, - OutputDesc = evaluate_record.result.evaluate != null && evaluate_record.result.evaluate.achievements.Count > 0 - ? evaluate_record.result.evaluate.achievements[0].evaluate_output_desc - : string.Empty, AchievementOtherDesc = evaluate_record.result.evaluate.achievement_other_desc, AchievementStrengthDesc = evaluate_record.result.evaluate.achievement_strength_desc, AchievementImproveDesc = evaluate_record.result.evaluate.achievement_improve_desc,