This commit is contained in:
parent
304a742dac
commit
294fc79425
1 changed files with 2 additions and 12 deletions
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue