diff --git a/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs index 29beac9a..180d63b8 100644 --- a/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs @@ -1,15 +1,13 @@ using BMA.EHR.Application.Common.Interfaces; -using BMA.EHR.Domain.Extensions; -using BMA.EHR.Domain.Models.Retirement; -using Microsoft.AspNetCore.Hosting; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Configuration; -using Newtonsoft.Json; -using System.Configuration; -using System.Net.Http.Headers; using BMA.EHR.Application.Responses; using BMA.EHR.Application.Repositories.MessageQueue; using BMA.EHR.Domain.Models.Probation; +using BMA.EHR.Domain.Extensions; +using Microsoft.AspNetCore.Hosting; +using Microsoft.EntityFrameworkCore; +using System.Net.Http.Headers; +using Newtonsoft.Json; +using System.Globalization; namespace BMA.EHR.Application.Repositories.Reports { @@ -41,7 +39,7 @@ namespace BMA.EHR.Application.Repositories.Reports #region แบบมอบหมายงาน ฯ public async Task GetProbationAssignAsync(Guid assign_id, string token) { - var api_url = $"https://bmaehr.joolsoft.com/nodeapi/v1/assign/probation-assign?assign_id={assign_id}"; + var api_url = $"https://bma-ehr.frappet.synology.me/api/v1/probation/assign/probation-assign?assign_id={assign_id}"; ProbationAssignResponse probation_assign; using (var client = new HttpClient()) { @@ -53,15 +51,6 @@ namespace BMA.EHR.Application.Repositories.Reports if (probation_assign.data != null) { - //Profile ผู้ทดลองงาน - string[] date_start_parts = string.IsNullOrEmpty(probation_assign.data.assign.date_start) ? null : probation_assign.data.assign.date_start.Split('-'); - string[] date_finish_parts = string.IsNullOrEmpty(probation_assign.data.assign.date_finish) ? null : probation_assign.data.assign.date_finish.Split('-'); - //Mentors - string[] date_mentor1_parts = probation_assign.data.mentors.Count > 0 ? probation_assign.data.mentors[0].dated.Split('-') : null; - string[] date_mentor2_parts = probation_assign.data.mentors.Count > 1 ? probation_assign.data.mentors[1].dated.Split('-') : null; - //Commander - string[] date_commander_parts = string.IsNullOrEmpty(probation_assign.data.commander.dated) ? null : probation_assign.data.commander.dated.Split('-'); - return new { Name = string.IsNullOrEmpty(probation_assign.data.profile.name) ? string.Empty : probation_assign.data.profile.name, @@ -69,16 +58,16 @@ namespace BMA.EHR.Application.Repositories.Reports Department = string.IsNullOrEmpty(probation_assign.data.profile.Department) ? string.Empty : probation_assign.data.profile.Department, OrganizationOrganization = string.IsNullOrEmpty(probation_assign.data.profile.OrganizationOrganization) ? string.Empty : probation_assign.data.profile.OrganizationOrganization, Oc = string.IsNullOrEmpty(probation_assign.data.profile.Oc) ? string.Empty : probation_assign.data.profile.Oc, - DateStart = string.IsNullOrEmpty(date_start_parts[0]) ? $"วันที่ เดือน พ.ศ." : ConvertDateMonthYear(date_start_parts[0], date_start_parts[1], date_start_parts[2]), - DateFinish = string.IsNullOrEmpty(date_finish_parts[0]) ? $"วันที่ เดือน พ.ศ." : ConvertDateMonthYear(date_finish_parts[0], date_finish_parts[1], date_finish_parts[2]), + DateStart = string.IsNullOrEmpty(probation_assign.data.assign.date_start.ToString()) ? "วันที่ เดือน พ.ศ." : probation_assign.data.assign.date_start.ToThaiFullDate().ToString().ToThaiNumber(), + DateFinish = string.IsNullOrEmpty(probation_assign.data.assign.date_finish.ToString()) ? "วันที่ เดือน พ.ศ." : probation_assign.data.assign.date_finish.ToThaiFullDate().ToString().ToThaiNumber(), NameMentor1 = string.IsNullOrEmpty(probation_assign.data.mentors[0].name) ? string.Empty : probation_assign.data.mentors[0].name, - DateMentor1 = string.IsNullOrEmpty(date_mentor1_parts[0]) ? $"วันที่ เดือน พ.ศ." : ConvertDateMonthYear(date_mentor1_parts[0], date_mentor1_parts[1], date_mentor1_parts[2]), + DateMentor1 = string.IsNullOrEmpty(probation_assign.data.mentors[0].dated.ToString()) ? "วันที่ เดือน พ.ศ." : probation_assign.data.mentors[0].dated.ToThaiFullDate().ToString().ToThaiNumber(), PositionMentor1 = string.IsNullOrEmpty(probation_assign.data.mentors[0].Position) ? string.Empty : probation_assign.data.mentors[0].Position, NameMentor2 = string.IsNullOrEmpty(probation_assign.data.mentors[1].name) ? string.Empty : probation_assign.data.mentors[1].name, - DateMentor2 = string.IsNullOrEmpty(date_mentor2_parts[0]) ? $"วันที่ เดือน พ.ศ." : ConvertDateMonthYear(date_mentor2_parts[0], date_mentor2_parts[1], date_mentor2_parts[2]), + DateMentor2 = string.IsNullOrEmpty(probation_assign.data.mentors[1].dated.ToString()) ? "วันที่ เดือน พ.ศ." : probation_assign.data.mentors[1].dated.ToThaiFullDate().ToString().ToThaiNumber(), PositionMentor2 = string.IsNullOrEmpty(probation_assign.data.mentors[1].Position) ? string.Empty : probation_assign.data.mentors[1].Position, NameCommander = string.IsNullOrEmpty(probation_assign.data.commander.name) ? string.Empty : probation_assign.data.commander.name, - DateCommander = string.IsNullOrEmpty(date_commander_parts[0]) ? $"วันที่ เดือน พ.ศ." : ConvertDateMonthYear(date_commander_parts[0], date_commander_parts[1], date_commander_parts[2]), + DateCommander = string.IsNullOrEmpty(probation_assign.data.commander.dated.ToString()) ? "วันที่ เดือน พ.ศ." : probation_assign.data.commander.dated.ToThaiFullDate().ToString().ToThaiNumber(), PositionCommander = string.IsNullOrEmpty(probation_assign.data.commander.Position) ? string.Empty : probation_assign.data.commander.Position, Jobs = probation_assign.data.jobs.ToList(), Knowledge = probation_assign.data.knowledges.ToList(), @@ -101,7 +90,7 @@ namespace BMA.EHR.Application.Repositories.Reports #region แบบบันทึกผล (ผู้ดูแล, ผู้บังคับบัญชา) public async Task GetEvaluateRecordAsync(Guid assign_id, string token) { - var api_url = $"https://bmaehr.joolsoft.com/nodeapi/v1/evaluate-record?assign_id={assign_id}"; + var api_url = $"https://bma-ehr.frappet.synology.me/api/v1/probation/report/form-record?id={assign_id}"; EvaluateRecordAssignResponse evaluate_record; using (var client = new HttpClient()) { @@ -113,59 +102,29 @@ namespace BMA.EHR.Application.Repositories.Reports if (evaluate_record.data != null) { - string[] date_start_parts = string.IsNullOrEmpty(evaluate_record.data.assign.date_start) ? null : evaluate_record.data.assign.date_start.Split('-'); - string[] date_finish_parts = string.IsNullOrEmpty(evaluate_record.data.assign.date_finish) ? null : evaluate_record.data.assign.date_finish.Split('-'); - string[] date_start_round_parts; - string[] date_finish_round_parts; - DateTime currentDate = DateTime.Now; - string[] date_curent_parts = currentDate.ToString("yyyy-MM-dd").Split('-'); - string[] achievement_strength_desc = new string[evaluate_record.data.evaluate.Count]; - string[] achievement_improve_desc = new string[evaluate_record.data.evaluate.Count]; - string[] behavior_strength_desc = new string[evaluate_record.data.evaluate.Count]; - string[] behavior_improve_desc = new string[evaluate_record.data.evaluate.Count]; - foreach (var evaluate in evaluate_record.data.evaluate) - { - int inx = 0; - evaluate.no = !string.IsNullOrEmpty(evaluate.no) ? evaluate.no.ToThaiNumber() : null; - date_start_round_parts = !string.IsNullOrEmpty(evaluate.date_start) ? evaluate.date_start.Split('-') : null; - evaluate.date_start = ConvertDateMonthYear(date_start_round_parts[0], date_start_round_parts[1], date_start_round_parts[2]); - date_finish_round_parts = !string.IsNullOrEmpty(evaluate.date_finish) ? evaluate.date_finish.Split('-') : null; - evaluate.date_finish = ConvertDateMonthYear(date_finish_round_parts[0], date_finish_round_parts[1], date_finish_round_parts[2]); - achievement_strength_desc[inx] = !string.IsNullOrEmpty(evaluate.achievement_strength_desc) ? evaluate.achievement_strength_desc : string.Empty; - achievement_improve_desc[inx] = !string.IsNullOrEmpty(evaluate.achievement_improve_desc) ? evaluate.achievement_improve_desc : string.Empty; - behavior_strength_desc[inx] = !string.IsNullOrEmpty(evaluate.behavior_strength_desc) ? evaluate.behavior_strength_desc : string.Empty; - behavior_improve_desc[inx] = !string.IsNullOrEmpty(evaluate.behavior_improve_desc) ? evaluate.behavior_improve_desc : string.Empty; - - inx++; - } + evaluate_record.data.evaluate.orientation = evaluate_record.data.evaluate.orientation == "1" ? "(/) ดำเนินการเเล้ว ( ) ยังไม่ได้ดำเนินการ" : "( ) ดำเนินการเเล้ว (/) ยังไม่ได้ดำเนินการ"; + evaluate_record.data.evaluate.self_learning = evaluate_record.data.evaluate.self_learning == "1" ? "(/) ดำเนินการเเล้ว ( ) ยังไม่ได้ดำเนินการ" : "( ) ดำเนินการเเล้ว (/) ยังไม่ได้ดำเนินการ"; + evaluate_record.data.evaluate.training_seminar = evaluate_record.data.evaluate.training_seminar == "1" ? "(/) ดำเนินการเเล้ว ( ) ยังไม่ได้ดำเนินการ" : "( ) ดำเนินการเเล้ว (/) ยังไม่ได้ดำเนินการ"; + evaluate_record.data.evaluate.other_training = evaluate_record.data.evaluate.other_training == "1" ? "(/) ดำเนินการเเล้ว ( ) ยังไม่ได้ดำเนินการ" : "( ) ดำเนินการเเล้ว (/) ยังไม่ได้ดำเนินการ"; return new { - //person or mentor - Name = string.IsNullOrEmpty(evaluate_record.data.person.name) ? string.Empty : evaluate_record.data.person.name, - Position = string.IsNullOrEmpty(evaluate_record.data.person.Position) ? string.Empty : evaluate_record.data.person.Position, - MentorDate = string.IsNullOrEmpty(date_curent_parts[0]) ? $"วันที่ เดือน พ.ศ." : ConvertDateMonthYear(date_curent_parts[0], date_curent_parts[1], date_curent_parts[2]), - //experimentee ผู้ดทดลองงาน - ExperimenteeName = string.IsNullOrEmpty(evaluate_record.data.experimentee.name) ? string.Empty : evaluate_record.data.experimentee.name, - ExperimenteePosition = string.IsNullOrEmpty(evaluate_record.data.experimentee.Position) ? string.Empty : evaluate_record.data.experimentee.Position, + DirectorName = string.IsNullOrEmpty(evaluate_record.data.director.name) ? string.Empty : evaluate_record.data.director.name, + DirectorPosition = string.IsNullOrEmpty(evaluate_record.data.director.Position) ? string.Empty : evaluate_record.data.director.Position, + DirectorDated = string.IsNullOrEmpty(evaluate_record.data.evaluate.sign_dated.ToString()) ? "วันที่ เดือน พ.ศ." : evaluate_record.data.evaluate.sign_dated.ToThaiFullDate().ToString().ToThaiNumber(), + Name = string.IsNullOrEmpty(evaluate_record.data.experimentee.name) ? string.Empty : evaluate_record.data.experimentee.name, + Position = string.IsNullOrEmpty(evaluate_record.data.experimentee.Position) ? string.Empty : evaluate_record.data.experimentee.Position, Department = string.IsNullOrEmpty(evaluate_record.data.experimentee.Department) ? string.Empty : evaluate_record.data.experimentee.Department, - OrganizationOrganization = string.IsNullOrEmpty(evaluate_record.data.experimentee.OrganizationOrganization) ? string.Empty : evaluate_record.data.experimentee.OrganizationOrganization, + Organizationorganization = string.IsNullOrEmpty(evaluate_record.data.experimentee.OrganizationOrganization) ? string.Empty : evaluate_record.data.experimentee.OrganizationOrganization, Oc = string.IsNullOrEmpty(evaluate_record.data.experimentee.Oc) ? string.Empty : evaluate_record.data.experimentee.Oc, - DateStart = string.IsNullOrEmpty(date_start_parts[0]) ? $"วันที่ เดือน พ.ศ." : ConvertDateMonthYear(date_start_parts[0], date_start_parts[1], date_start_parts[2]), - DateFinish = string.IsNullOrEmpty(date_finish_parts[0]) ? $"วันที่ เดือน พ.ศ." : ConvertDateMonthYear(date_finish_parts[0], date_finish_parts[1], date_finish_parts[2]), - Evaluates = evaluate_record.data.evaluate.ToList(), - AchievementStrengthDesc1 = string.IsNullOrEmpty(achievement_strength_desc[0]) ? string.Empty : achievement_strength_desc[0].ToString(), - AchievementStrengthDesc2 = string.IsNullOrEmpty(achievement_strength_desc[1]) ? string.Empty : achievement_strength_desc[1].ToString(), - AchievementStrengthDesc3 = string.IsNullOrEmpty(achievement_strength_desc[2]) ? string.Empty : achievement_strength_desc[2].ToString(), - AchievementImproveDesc1 = string.IsNullOrEmpty(achievement_improve_desc[0]) ? string.Empty : achievement_improve_desc[0].ToString(), - AchievementImproveDesc2 = string.IsNullOrEmpty(achievement_improve_desc[1]) ? string.Empty : achievement_improve_desc[1].ToString(), - AchievementImproveDesc3 = string.IsNullOrEmpty(achievement_improve_desc[2]) ? string.Empty : achievement_improve_desc[2].ToString(), - BehaviorStrengthDesc1 = string.IsNullOrEmpty(behavior_strength_desc[0]) ? string.Empty : behavior_strength_desc[0].ToString(), - BehaviorStrengthDesc2 = string.IsNullOrEmpty(behavior_strength_desc[1]) ? string.Empty : behavior_strength_desc[1].ToString(), - BehaviorStrengthDesc3 = string.IsNullOrEmpty(behavior_strength_desc[2]) ? string.Empty : behavior_strength_desc[2].ToString(), - BehaviorImproveDesc1 = string.IsNullOrEmpty(behavior_improve_desc[0]) ? string.Empty : behavior_improve_desc[0].ToString(), - BehaviorImproveDesc2 = string.IsNullOrEmpty(behavior_improve_desc[1]) ? string.Empty : behavior_improve_desc[1].ToString(), - BehaviorImproveDesc3 = string.IsNullOrEmpty(behavior_improve_desc[2]) ? string.Empty : behavior_improve_desc[2].ToString(), + DateStart = string.IsNullOrEmpty(evaluate_record.data.assign.date_start.ToString()) ? "วันที่ เดือน พ.ศ." : evaluate_record.data.assign.date_start.ToThaiFullDate().ToString().ToThaiNumber(), + DateFinish = string.IsNullOrEmpty(evaluate_record.data.assign.date_finish.ToString()) ? "วันที่ เดือน พ.ศ." : evaluate_record.data.assign.date_finish.ToThaiFullDate().ToString().ToThaiNumber(), + No = evaluate_record.data.evaluate.no = string.IsNullOrEmpty(evaluate_record.data.evaluate.no) ? string.Empty : evaluate_record.data.evaluate.no.ToThaiNumber(), + EvaluateDateStart = string.IsNullOrEmpty(evaluate_record.data.evaluate.date_start.ToString()) ? string.Empty : evaluate_record.data.evaluate.date_start.ToThaiFullDate().ToString().ToThaiNumber(), + EvaluateDateFinish = string.IsNullOrEmpty(evaluate_record.data.evaluate.date_finish.ToString()) ? string.Empty : evaluate_record.data.evaluate.date_finish.ToThaiFullDate().ToString().ToThaiNumber(), + Achievements = evaluate_record.data.evaluate.achievements, + Role = evaluate_record.data.evaluate.role == "mentor" ? "ผู้ดูแลการทดลองปฎิบัติหน้าที่ราชการ" : "ผู้บังคับบัญชา", + Evaluate = evaluate_record.data.evaluate, }; } else @@ -177,9 +136,9 @@ namespace BMA.EHR.Application.Repositories.Reports #endregion #region แบบประเมินผล(ผู้บังคับบัญชา) - public async Task GetEvaluateAssignAsync(Guid id, string no, string token) + public async Task GetEvaluateAssignAsync(Guid id, string token) { - var api_url = $"https://bmaehr.joolsoft.com/nodeapi/v1/evaluate?assign_id={id}&evaluate_no={no}"; + var api_url = $"https://bma-ehr.frappet.synology.me/api/v1/probation/report/evaluate-commander?id={id}"; EvaluateAssignResponse evaluate_assign; using (var client = new HttpClient()) { @@ -191,141 +150,28 @@ namespace BMA.EHR.Application.Repositories.Reports if (evaluate_assign.data != null) { - //Assign - string[] date_start_parts = evaluate_assign.data.assign.date_start.Split('-'); - string[] date_finish_parts = evaluate_assign.data.assign.date_finish.Split('-'); - //Evaluate - string[] evaluate_date_start_parts = evaluate_assign.data.evaluate.date_start.Split('-'); - string[] evaluate_date_finish_parts = evaluate_assign.data.evaluate.date_finish.Split('-'); - string[] evaluate_assessor_dated = evaluate_assign.data.evaluate.commander_dated.Split('-'); - - + evaluate_assign.data.evaluate.orientation = evaluate_assign.data.evaluate.orientation == "1" ? "[/] ดำเนินการแล้ว [ ] ยังไม่ได้ดำเนินการ" : "[ ] ดำเนินการแล้ว [/] ยังไม่ได้ดำเนินการ"; + evaluate_assign.data.evaluate.self_learning = evaluate_assign.data.evaluate.self_learning == "1" ? "[/] ดำเนินการแล้ว [ ] ยังไม่ได้ดำเนินการ" : "[ ] ดำเนินการแล้ว [/] ยังไม่ได้ดำเนินการ"; + evaluate_assign.data.evaluate.training_seminar = evaluate_assign.data.evaluate.training_seminar == "1" ? "[/] ดำเนินการแล้ว [ ] ยังไม่ได้ดำเนินการ" : "[ ] ดำเนินการแล้ว [/] ยังไม่ได้ดำเนินการ"; + evaluate_assign.data.evaluate.other_training = evaluate_assign.data.evaluate.other_training == "1" ? "[/] ดำเนินการแล้ว [ ] ยังไม่ได้ดำเนินการ" : "[ ] ดำเนินการแล้ว [/] ยังไม่ได้ดำเนินการ"; return new { - No = evaluate_assign.data.evaluate.no, - EvaluateDateStart = ConvertDateMonthYear(evaluate_date_start_parts[0], evaluate_date_start_parts[1], evaluate_date_start_parts[2]), - EvaluateDateFinish = ConvertDateMonthYear(evaluate_date_finish_parts[0], evaluate_date_finish_parts[1], evaluate_date_finish_parts[2]), + No = string.IsNullOrEmpty(evaluate_assign.data.evaluate.no.ToString()) ? string.Empty : evaluate_assign.data.evaluate.no.ToString().ToThaiNumber(), + EvaluateDateStart = string.IsNullOrEmpty(evaluate_assign.data.evaluate.date_start.ToString()) ? "วันที่ เดือน พ.ศ." : evaluate_assign.data.evaluate.date_start.ToThaiFullDate().ToString().ToThaiNumber(), + EvaluateDateFinish = string.IsNullOrEmpty(evaluate_assign.data.evaluate.date_start.ToString()) ? "วันที่ เดือน พ.ศ." : evaluate_assign.data.evaluate.date_start.ToThaiFullDate().ToString().ToThaiNumber(), Name = string.IsNullOrEmpty(evaluate_assign.data.experimentee.name) ? string.Empty : evaluate_assign.data.experimentee.name, Position = string.IsNullOrEmpty(evaluate_assign.data.experimentee.Position) ? string.Empty : evaluate_assign.data.experimentee.Position, Department = string.IsNullOrEmpty(evaluate_assign.data.experimentee.Department) ? string.Empty : evaluate_assign.data.experimentee.Department, OrganizationOrganization = string.IsNullOrEmpty(evaluate_assign.data.experimentee.OrganizationOrganization) ? string.Empty : evaluate_assign.data.experimentee.OrganizationOrganization, Oc = string.IsNullOrEmpty(evaluate_assign.data.experimentee.Oc) ? string.Empty : evaluate_assign.data.experimentee.Oc, - DateStart = ConvertDateMonthYear(date_start_parts[0], date_start_parts[1], date_start_parts[2]), - DateFinish = ConvertDateMonthYear(date_finish_parts[0], date_finish_parts[1], date_finish_parts[2]), - //table1 ผลสัมฤทธิ์ - KnowledgeLevel1 = evaluate_assign.data.evaluate.knowledge_level.ToString() == "1" ? "/" : string.Empty, - KnowledgeLevel2 = evaluate_assign.data.evaluate.knowledge_level.ToString() == "2" ? "/" : string.Empty, - KnowledgeLevel3 = evaluate_assign.data.evaluate.knowledge_level.ToString() == "3" ? "/" : string.Empty, - KnowledgeLevel4 = evaluate_assign.data.evaluate.knowledge_level.ToString() == "4" ? "/" : string.Empty, - KnowledgeLevel5 = evaluate_assign.data.evaluate.knowledge_level.ToString() == "5" ? "/" : string.Empty, - SkillLevel1 = evaluate_assign.data.evaluate.skill_level.ToString() == "1" ? "/" : string.Empty, - SkillLevel2 = evaluate_assign.data.evaluate.skill_level.ToString() == "2" ? "/" : string.Empty, - SkillLevel3 = evaluate_assign.data.evaluate.skill_level.ToString() == "3" ? "/" : string.Empty, - SkillLevel4 = evaluate_assign.data.evaluate.skill_level.ToString() == "4" ? "/" : string.Empty, - SkillLevel5 = evaluate_assign.data.evaluate.skill_level.ToString() == "5" ? "/" : string.Empty, - CompetencyLevel1 = evaluate_assign.data.evaluate.competency_level.ToString() == "1" ? "/" : string.Empty, - CompetencyLevel2 = evaluate_assign.data.evaluate.competency_level.ToString() == "2" ? "/" : string.Empty, - CompetencyLevel3 = evaluate_assign.data.evaluate.competency_level.ToString() == "3" ? "/" : string.Empty, - CompetencyLevel4 = evaluate_assign.data.evaluate.competency_level.ToString() == "4" ? "/" : string.Empty, - CompetencyLevel5 = evaluate_assign.data.evaluate.competency_level.ToString() == "5" ? "/" : string.Empty, - LearnLevel1 = evaluate_assign.data.evaluate.learn_level.ToString() == "1" ? "/" : string.Empty, - LearnLevel2 = evaluate_assign.data.evaluate.learn_level.ToString() == "2" ? "/" : string.Empty, - LearnLevel3 = evaluate_assign.data.evaluate.learn_level.ToString() == "3" ? "/" : string.Empty, - LearnLevel4 = evaluate_assign.data.evaluate.learn_level.ToString() == "4" ? "/" : string.Empty, - LearnLevel5 = evaluate_assign.data.evaluate.learn_level.ToString() == "5" ? "/" : string.Empty, - ApplyLevel1 = evaluate_assign.data.evaluate.apply_level.ToString() == "1" ? "/" : string.Empty, - ApplyLevel2 = evaluate_assign.data.evaluate.apply_level.ToString() == "2" ? "/" : string.Empty, - ApplyLevel3 = evaluate_assign.data.evaluate.apply_level.ToString() == "3" ? "/" : string.Empty, - ApplyLevel4 = evaluate_assign.data.evaluate.apply_level.ToString() == "4" ? "/" : string.Empty, - ApplyLevel5 = evaluate_assign.data.evaluate.apply_level.ToString() == "5" ? "/" : string.Empty, - SuccessLevel1 = evaluate_assign.data.evaluate.success_level.ToString() == "1" ? "/" : string.Empty, - SuccessLevel2 = evaluate_assign.data.evaluate.success_level.ToString() == "2" ? "/" : string.Empty, - SuccessLevel3 = evaluate_assign.data.evaluate.success_level.ToString() == "3" ? "/" : string.Empty, - SuccessLevel4 = evaluate_assign.data.evaluate.success_level.ToString() == "4" ? "/" : string.Empty, - SuccessLevel5 = evaluate_assign.data.evaluate.success_level.ToString() == "5" ? "/" : string.Empty, - AchievementOtherDesc = evaluate_assign.data.evaluate.achievement_other_desc, - AchievementOtherLevel1 = evaluate_assign.data.evaluate.achievement_other_level.ToString() == "1" ? "/" : string.Empty, - AchievementOtherLevel2 = evaluate_assign.data.evaluate.achievement_other_level.ToString() == "2" ? "/" : string.Empty, - AchievementOtherLevel3 = evaluate_assign.data.evaluate.achievement_other_level.ToString() == "3" ? "/" : string.Empty, - AchievementOtherLevel4 = evaluate_assign.data.evaluate.achievement_other_level.ToString() == "4" ? "/" : string.Empty, - AchievementOtherLevel5 = evaluate_assign.data.evaluate.achievement_other_level.ToString() == "5" ? "/" : string.Empty, - //table2 พฤติกรรม - Conduct1Level1 = evaluate_assign.data.evaluate.conduct1_level.ToString() == "1" ? "/" : string.Empty, - Conduct1Level2 = evaluate_assign.data.evaluate.conduct1_level.ToString() == "2" ? "/" : string.Empty, - Conduct1Level3 = evaluate_assign.data.evaluate.conduct1_level.ToString() == "3" ? "/" : string.Empty, - Conduct1Level4 = evaluate_assign.data.evaluate.conduct1_level.ToString() == "4" ? "/" : string.Empty, - Conduct1Level5 = evaluate_assign.data.evaluate.conduct1_level.ToString() == "5" ? "/" : string.Empty, - Conduct2Level1 = evaluate_assign.data.evaluate.conduct2_level.ToString() == "1" ? "/" : string.Empty, - Conduct2Level2 = evaluate_assign.data.evaluate.conduct2_level.ToString() == "2" ? "/" : string.Empty, - Conduct2Level3 = evaluate_assign.data.evaluate.conduct2_level.ToString() == "3" ? "/" : string.Empty, - Conduct2Level4 = evaluate_assign.data.evaluate.conduct2_level.ToString() == "4" ? "/" : string.Empty, - Conduct2Level5 = evaluate_assign.data.evaluate.conduct2_level.ToString() == "5" ? "/" : string.Empty, - Conduct3Level1 = evaluate_assign.data.evaluate.conduct3_level.ToString() == "1" ? "/" : string.Empty, - Conduct3Level2 = evaluate_assign.data.evaluate.conduct3_level.ToString() == "2" ? "/" : string.Empty, - Conduct3Level3 = evaluate_assign.data.evaluate.conduct3_level.ToString() == "3" ? "/" : string.Empty, - Conduct3Level4 = evaluate_assign.data.evaluate.conduct3_level.ToString() == "4" ? "/" : string.Empty, - Conduct3Level5 = evaluate_assign.data.evaluate.conduct3_level.ToString() == "5" ? "/" : string.Empty, - Conduct4Level1 = evaluate_assign.data.evaluate.conduct4_level.ToString() == "1" ? "/" : string.Empty, - Conduct4Level2 = evaluate_assign.data.evaluate.conduct4_level.ToString() == "2" ? "/" : string.Empty, - Conduct4Level3 = evaluate_assign.data.evaluate.conduct4_level.ToString() == "3" ? "/" : string.Empty, - Conduct4Level4 = evaluate_assign.data.evaluate.conduct4_level.ToString() == "4" ? "/" : string.Empty, - Conduct4Level5 = evaluate_assign.data.evaluate.conduct4_level.ToString() == "5" ? "/" : string.Empty, - Moral1Level1 = evaluate_assign.data.evaluate.moral1_level.ToString() == "1" ? "/" : string.Empty, - Moral1Level2 = evaluate_assign.data.evaluate.moral1_level.ToString() == "2" ? "/" : string.Empty, - Moral1Level3 = evaluate_assign.data.evaluate.moral1_level.ToString() == "3" ? "/" : string.Empty, - Moral1Level4 = evaluate_assign.data.evaluate.moral1_level.ToString() == "4" ? "/" : string.Empty, - Moral1Level5 = evaluate_assign.data.evaluate.moral1_level.ToString() == "5" ? "/" : string.Empty, - Moral2Level1 = evaluate_assign.data.evaluate.moral2_level.ToString() == "1" ? "/" : string.Empty, - Moral2Level2 = evaluate_assign.data.evaluate.moral2_level.ToString() == "2" ? "/" : string.Empty, - Moral2Level3 = evaluate_assign.data.evaluate.moral2_level.ToString() == "3" ? "/" : string.Empty, - Moral2Level4 = evaluate_assign.data.evaluate.moral2_level.ToString() == "4" ? "/" : string.Empty, - Moral2Level5 = evaluate_assign.data.evaluate.moral2_level.ToString() == "5" ? "/" : string.Empty, - Moral3Level1 = evaluate_assign.data.evaluate.moral3_level.ToString() == "1" ? "/" : string.Empty, - Moral3Level2 = evaluate_assign.data.evaluate.moral3_level.ToString() == "2" ? "/" : string.Empty, - Moral3Level3 = evaluate_assign.data.evaluate.moral3_level.ToString() == "3" ? "/" : string.Empty, - Moral3Level4 = evaluate_assign.data.evaluate.moral3_level.ToString() == "4" ? "/" : string.Empty, - Moral3Level5 = evaluate_assign.data.evaluate.moral3_level.ToString() == "5" ? "/" : string.Empty, - Discipline1Level1 = evaluate_assign.data.evaluate.discipline1_level.ToString() == "1" ? "/" : string.Empty, - Discipline1Level2 = evaluate_assign.data.evaluate.discipline1_level.ToString() == "2" ? "/" : string.Empty, - Discipline1Level3 = evaluate_assign.data.evaluate.discipline1_level.ToString() == "3" ? "/" : string.Empty, - Discipline1Level4 = evaluate_assign.data.evaluate.discipline1_level.ToString() == "4" ? "/" : string.Empty, - Discipline1Level5 = evaluate_assign.data.evaluate.discipline1_level.ToString() == "5" ? "/" : string.Empty, - Discipline2Level1 = evaluate_assign.data.evaluate.discipline2_level.ToString() == "1" ? "/" : string.Empty, - Discipline2Level2 = evaluate_assign.data.evaluate.discipline2_level.ToString() == "2" ? "/" : string.Empty, - Discipline2Level3 = evaluate_assign.data.evaluate.discipline2_level.ToString() == "3" ? "/" : string.Empty, - Discipline2Level4 = evaluate_assign.data.evaluate.discipline2_level.ToString() == "4" ? "/" : string.Empty, - Discipline2Level5 = evaluate_assign.data.evaluate.discipline2_level.ToString() == "5" ? "/" : string.Empty, - Discipline3Level1 = evaluate_assign.data.evaluate.discipline3_level.ToString() == "1" ? "/" : string.Empty, - Discipline3Level2 = evaluate_assign.data.evaluate.discipline3_level.ToString() == "2" ? "/" : string.Empty, - Discipline3Level3 = evaluate_assign.data.evaluate.discipline3_level.ToString() == "3" ? "/" : string.Empty, - Discipline3Level4 = evaluate_assign.data.evaluate.discipline3_level.ToString() == "4" ? "/" : string.Empty, - Discipline3Level5 = evaluate_assign.data.evaluate.discipline3_level.ToString() == "5" ? "/" : string.Empty, - Discipline4Level1 = evaluate_assign.data.evaluate.discipline4_level.ToString() == "1" ? "/" : string.Empty, - Discipline4Level2 = evaluate_assign.data.evaluate.discipline4_level.ToString() == "2" ? "/" : string.Empty, - Discipline4Level3 = evaluate_assign.data.evaluate.discipline4_level.ToString() == "3" ? "/" : string.Empty, - Discipline4Level4 = evaluate_assign.data.evaluate.discipline4_level.ToString() == "4" ? "/" : string.Empty, - Discipline4Level5 = evaluate_assign.data.evaluate.discipline4_level.ToString() == "5" ? "/" : string.Empty, - Discipline5Level1 = evaluate_assign.data.evaluate.discipline5_level.ToString() == "1" ? "/" : string.Empty, - Discipline5Level2 = evaluate_assign.data.evaluate.discipline5_level.ToString() == "2" ? "/" : string.Empty, - Discipline5Level3 = evaluate_assign.data.evaluate.discipline5_level.ToString() == "3" ? "/" : string.Empty, - Discipline5Level4 = evaluate_assign.data.evaluate.discipline5_level.ToString() == "4" ? "/" : string.Empty, - Discipline5Level5 = evaluate_assign.data.evaluate.discipline5_level.ToString() == "5" ? "/" : string.Empty, - BehaviorOtherDesc = evaluate_assign.data.evaluate.behavior_other_desc, - BehaviorOtherLevel1 = evaluate_assign.data.evaluate.behavior_other_level.ToString() == "1" ? "/" : string.Empty, - BehaviorOtherLevel2 = evaluate_assign.data.evaluate.behavior_other_level.ToString() == "2" ? "/" : string.Empty, - BehaviorOtherLevel3 = evaluate_assign.data.evaluate.behavior_other_level.ToString() == "3" ? "/" : string.Empty, - BehaviorOtherLevel4 = evaluate_assign.data.evaluate.behavior_other_level.ToString() == "4" ? "/" : string.Empty, - BehaviorOtherLevel5 = evaluate_assign.data.evaluate.behavior_other_level.ToString() == "5" ? "/" : string.Empty, + DateStart = string.IsNullOrEmpty(evaluate_assign.data.assign.date_start.ToString()) ? "วันที่ เดือน พ.ศ." : evaluate_assign.data.assign.date_start.ToThaiFullDate().ToString().ToThaiNumber(), + DateFinish = string.IsNullOrEmpty(evaluate_assign.data.assign.date_finish.ToString()) ? "วันที่ เดือน พ.ศ." : evaluate_assign.data.assign.date_finish.ToThaiFullDate().ToString().ToThaiNumber(), + CommanderName = string.IsNullOrEmpty(evaluate_assign.data.commander.name) ? string.Empty : evaluate_assign.data.commander.name, + CommanderPosition = string.IsNullOrEmpty(evaluate_assign.data.commander.Position) ? string.Empty : evaluate_assign.data.commander.Position, + CommanderDated = string.IsNullOrEmpty(evaluate_assign.data.evaluate.sign_dated.ToString()) ? "วันที่ เดือน พ.ศ." : evaluate_assign.data.evaluate.sign_dated.ToThaiFullDate().ToString().ToThaiNumber(), BehaviorStrengthDesc = evaluate_assign.data.evaluate.behavior_strength_desc, BehaviorImproveDesc = evaluate_assign.data.evaluate.behavior_improve_desc, - //table3 - Orientation = evaluate_assign.data.evaluate.orientation == 1 ? "[/] ดำเนินการแล้ว [ ] ยังไม่ได้ดำเนินการ" : "[ ] ดำเนินการแล้ว [/] ยังไม่ได้ดำเนินการ", - SelfLearning = evaluate_assign.data.evaluate.self_learning == 1 ? "[/] ดำเนินการแล้ว [ ] ยังไม่ได้ดำเนินการ" : "[ ] ดำเนินการแล้ว [/] ยังไม่ได้ดำเนินการ", - TrainingSeminar = evaluate_assign.data.evaluate.training_seminar == 1 ? "[/] ดำเนินการแล้ว [ ] ยังไม่ได้ดำเนินการ" : "[ ] ดำเนินการแล้ว [/] ยังไม่ได้ดำเนินการ", - OtherTraining = evaluate_assign.data.evaluate.other_training == 1 ? "[/] ดำเนินการแล้ว [ ] ยังไม่ได้ดำเนินการ" : "[ ] ดำเนินการแล้ว [/] ยังไม่ได้ดำเนินการ", - CommanderName = string.IsNullOrEmpty(evaluate_assign.data.person.name) ? string.Empty : evaluate_assign.data.person.name, - CommanderPosition = string.IsNullOrEmpty(evaluate_assign.data.person.Position) ? string.Empty : evaluate_assign.data.person.Position, - AssessorDated = ConvertDateMonthYear(evaluate_assessor_dated[0], evaluate_assessor_dated[1], evaluate_assessor_dated[2]), + Evaluate = evaluate_assign.data.evaluate, }; } @@ -338,9 +184,9 @@ namespace BMA.EHR.Application.Repositories.Reports #endregion #region แบบประเมินผล(คณะกรรมการ) - public async Task GetEvaluateChairmanAssignAsync(Guid id, string no, string token) + public async Task GetEvaluateChairmanAssignAsync(Guid id, string token) { - var api_url = $"https://bmaehr.joolsoft.com/nodeapi/v1/evaluate-chairman?assign_id={id}&evaluate_no={no}"; + var api_url = $"https://bma-ehr.frappet.synology.me/api/v1/probation/report/evaluate-chairman?id={id}"; EvaluateChairmanAssignResponse evaluate_assign; using (var client = new HttpClient()) { @@ -352,80 +198,29 @@ namespace BMA.EHR.Application.Repositories.Reports if (evaluate_assign.data != null) { - //Assign - string[] date_start_parts = evaluate_assign.data.assign.date_start.Split('-'); - string[] date_finish_parts = evaluate_assign.data.assign.date_finish.Split('-'); - //Evaluate - string[] evaluate_date_start_parts = evaluate_assign.data.evaluate.date_start.Split('-'); - string[] evaluate_date_finish_parts = evaluate_assign.data.evaluate.date_finish.Split('-'); - string[] date_chiarman_part = string.IsNullOrEmpty(evaluate_assign.data.chairman.dated) ? null : evaluate_assign.data.chairman.dated.ToString().Split('-'); - string[] date_mentor1_part = evaluate_assign.data.mentors[0].dated.ToString().Split('-'); - string[] date_mentor2_part = evaluate_assign.data.mentors[1].dated.ToString().Split('-'); - return new { - No = evaluate_assign.data.evaluate.no, - EvaluateDateStart = ConvertDateMonthYear(evaluate_date_start_parts[0], evaluate_date_start_parts[1], evaluate_date_start_parts[2]), - EvaluateDateFinish = ConvertDateMonthYear(evaluate_date_finish_parts[0], evaluate_date_finish_parts[1], evaluate_date_finish_parts[2]), + No = string.IsNullOrEmpty(evaluate_assign.data.evaluate.no.ToString()) ? string.Empty : evaluate_assign.data.evaluate.no.ToString().ToThaiNumber(), + EvaluateDateStart = string.IsNullOrEmpty(evaluate_assign.data.evaluate.date_start.ToString()) ? "วันที่ เดือน พ.ศ." : evaluate_assign.data.evaluate.date_start.ToThaiFullDate().ToString().ToThaiNumber(), + EvaluateDateFinish = string.IsNullOrEmpty(evaluate_assign.data.evaluate.date_start.ToString()) ? "วันที่ เดือน พ.ศ." : evaluate_assign.data.evaluate.date_start.ToThaiFullDate().ToString().ToThaiNumber(), Name = string.IsNullOrEmpty(evaluate_assign.data.experimentee.name) ? string.Empty : evaluate_assign.data.experimentee.name, Position = string.IsNullOrEmpty(evaluate_assign.data.experimentee.Position) ? string.Empty : evaluate_assign.data.experimentee.Position, Department = string.IsNullOrEmpty(evaluate_assign.data.experimentee.Department) ? string.Empty : evaluate_assign.data.experimentee.Department, OrganizationOrganization = string.IsNullOrEmpty(evaluate_assign.data.experimentee.OrganizationOrganization) ? string.Empty : evaluate_assign.data.experimentee.OrganizationOrganization, Oc = string.IsNullOrEmpty(evaluate_assign.data.experimentee.Oc) ? string.Empty : evaluate_assign.data.experimentee.Oc, - DateStart = ConvertDateMonthYear(date_start_parts[0], date_start_parts[1], date_start_parts[2]), - DateFinish = ConvertDateMonthYear(date_finish_parts[0], date_finish_parts[1], date_finish_parts[2]), - ChairmanName = string.IsNullOrEmpty(evaluate_assign.data.chairman.profile.name) ? string.Empty : evaluate_assign.data.chairman.profile.name, - ChairmanPosition = string.IsNullOrEmpty(evaluate_assign.data.chairman.profile.Position) ? string.Empty : evaluate_assign.data.chairman.profile.Position, - ChairmanDate = date_chiarman_part != null ? ConvertDateMonthYear(date_chiarman_part[0], date_chiarman_part[1], date_chiarman_part[2]) : ConvertDateMonthYear("", "", ""), - //คณะกรรม ? mentors ? - MentorName1 = string.IsNullOrEmpty(evaluate_assign.data.mentors[0].profile.name) ? string.Empty : evaluate_assign.data.mentors[0].profile.name, - MentorName2 = string.IsNullOrEmpty(evaluate_assign.data.mentors[1].profile.name) ? string.Empty : evaluate_assign.data.mentors[1].profile.name, - MentorPosition1 = string.IsNullOrEmpty(evaluate_assign.data.mentors[0].profile.Position) ? string.Empty : evaluate_assign.data.mentors[0].profile.Position, - MentorPosition2 = string.IsNullOrEmpty(evaluate_assign.data.mentors[1].profile.Position) ? string.Empty : evaluate_assign.data.mentors[1].profile.Position, - MentorDate1 = date_mentor1_part != null ? ConvertDateMonthYear(date_mentor1_part[0], date_mentor1_part[1], date_mentor1_part[2]) : ConvertDateMonthYear("", "", ""), - MentorDate2 = date_mentor2_part != null ? ConvertDateMonthYear(date_mentor2_part[0], date_mentor2_part[1], date_mentor2_part[2]) : ConvertDateMonthYear("", "", ""), - //1 - KnowledgeLevel = evaluate_assign.data.evaluate.knowledge_level.ToString().ToThaiNumber(), - ApplyLevel = evaluate_assign.data.evaluate.apply_level.ToString().ToThaiNumber(), - SuccessLevel = evaluate_assign.data.evaluate.success_level.ToString().ToThaiNumber(), - AchievementOtherDesc = evaluate_assign.data.evaluate.achievement_other_desc, - AchievementOtherLevel = evaluate_assign.data.evaluate.achievement_other_level.ToString().ToThaiNumber(), - //2 - Conduct1Level = evaluate_assign.data.evaluate.conduct1_level.ToString().ToThaiNumber(), - Conduct2Level = evaluate_assign.data.evaluate.conduct2_level.ToString().ToThaiNumber(), - Conduct3Level = evaluate_assign.data.evaluate.conduct3_level.ToString().ToThaiNumber(), - Conduct4Level = evaluate_assign.data.evaluate.conduct4_level.ToString().ToThaiNumber(), - Moral1Level = evaluate_assign.data.evaluate.moral1_level.ToString().ToThaiNumber(), - Moral2Level = evaluate_assign.data.evaluate.moral2_level.ToString().ToThaiNumber(), - Moral3Level = evaluate_assign.data.evaluate.moral3_level.ToString().ToThaiNumber(), - Discipline1Level = evaluate_assign.data.evaluate.discipline1_level.ToString().ToThaiNumber(), - Discipline2Level = evaluate_assign.data.evaluate.discipline2_level.ToString().ToThaiNumber(), - Discipline3Level = evaluate_assign.data.evaluate.discipline3_level.ToString().ToThaiNumber(), - Discipline4Level = evaluate_assign.data.evaluate.discipline4_level.ToString().ToThaiNumber(), - Discipline5Level = evaluate_assign.data.evaluate.discipline4_level.ToString().ToThaiNumber(), - BehaviorOtherDesc = evaluate_assign.data.evaluate.behavior_other_desc, - BehaviorOtherLevel = evaluate_assign.data.evaluate.behavior_other_level.ToString().ToThaiNumber(), - //3 - AchievementScore = evaluate_assign.data.evaluate.achievement_score.ToString().ToThaiNumber(), - AchievementPercent = evaluate_assign.data.evaluate.achievement_percent.ToString().ToThaiNumber(), - AchievementResult = evaluate_assign.data.evaluate.achievement_result.ToString().ToThaiNumber(), - BehaviorScore = evaluate_assign.data.evaluate.behavior_score.ToString().ToThaiNumber(), - BehaviorPercent = evaluate_assign.data.evaluate.behavior_percent.ToString().ToThaiNumber(), - BehaviorResult = evaluate_assign.data.evaluate.behavior_result.ToString().ToThaiNumber(), - AchievementScoretotal = evaluate_assign.data.evaluate.achievement_score_total.ToString().ToThaiNumber(), - BehaviorScoretotal = evaluate_assign.data.evaluate.behavior_score_total.ToString().ToThaiNumber(), - //4 - DevelopOrientationScore = evaluate_assign.data.evaluate.develop_orientation_score.ToString().ToThaiNumber(), - DevelopSelfLearningScore = evaluate_assign.data.evaluate.develop_self_learning_score.ToString().ToThaiNumber(), - DevelopTrainingSeminarScore = evaluate_assign.data.evaluate.develop_training_seminar_score.ToString().ToThaiNumber(), - DevelopOtherTrainingScore = evaluate_assign.data.evaluate.develop_other_training_score.ToString().ToThaiNumber(), - DevelopOrientationPercent = evaluate_assign.data.evaluate.develop_orientation_percent.ToString().ToThaiNumber(), - DevelopSelfLearningPercent = evaluate_assign.data.evaluate.develop_self_learning_percent.ToString().ToThaiNumber(), - DevelopTrainingSeminarPercent = evaluate_assign.data.evaluate.develop_training_seminar_percent.ToString().ToThaiNumber(), - DevelopOtherTrainingPercent = evaluate_assign.data.evaluate.develop_other_training_percent.ToString().ToThaiNumber(), - DevelopResult = evaluate_assign.data.evaluate.develop_result.ToString(), - + DateStart = string.IsNullOrEmpty(evaluate_assign.data.assign.date_start.ToString()) ? "วันที่ เดือน พ.ศ." : evaluate_assign.data.assign.date_start.ToThaiFullDate().ToString().ToThaiNumber(), + DateFinish = string.IsNullOrEmpty(evaluate_assign.data.assign.date_finish.ToString()) ? "วันที่ เดือน พ.ศ." : evaluate_assign.data.assign.date_finish.ToThaiFullDate().ToString().ToThaiNumber(), + ChairmanName = string.IsNullOrEmpty(evaluate_assign.data.chairman.name) ? string.Empty : evaluate_assign.data.chairman.name, + ChairmanPosition = string.IsNullOrEmpty(evaluate_assign.data.chairman.Position) ? string.Empty : evaluate_assign.data.chairman.Position, + ChairmanDated = string.IsNullOrEmpty(evaluate_assign.data.evaluate.chairman_dated.ToString()) ? "วันที่ เดือน พ.ศ." : evaluate_assign.data.evaluate.chairman_dated.ToThaiFullDate().ToString().ToThaiNumber(), + Director1Name = string.IsNullOrEmpty(evaluate_assign.data.director1.name) ? string.Empty : evaluate_assign.data.director1.name, + Director1Position = string.IsNullOrEmpty(evaluate_assign.data.director1.Position) ? string.Empty : evaluate_assign.data.director1.Position, + Director1Dated = string.IsNullOrEmpty(evaluate_assign.data.evaluate.director1_dated.ToString()) ? "วันที่ เดือน พ.ศ." : evaluate_assign.data.evaluate.director1_dated.ToThaiFullDate().ToString().ToThaiNumber(), + Director2Name = string.IsNullOrEmpty(evaluate_assign.data.director2.name) ? string.Empty : evaluate_assign.data.director2.name, + Director2Position = string.IsNullOrEmpty(evaluate_assign.data.director2.Position) ? string.Empty : evaluate_assign.data.director2.Position, + Director2Dated = string.IsNullOrEmpty(evaluate_assign.data.evaluate.director2_dated.ToString()) ? "วันที่ เดือน พ.ศ." : evaluate_assign.data.evaluate.director2_dated.ToThaiFullDate().ToString().ToThaiNumber(), + Evaluate = evaluate_assign.data.evaluate, }; } else @@ -439,7 +234,7 @@ namespace BMA.EHR.Application.Repositories.Reports #region แบบรายงานการประเมินผล public async Task GetEvaluateResultAssignAsync(Guid id, string token) { - var api_url = $"https://bmaehr.joolsoft.com/nodeapi/v1/evaluate-result?assign_id={id}"; + var api_url = $"https://bma-ehr.frappet.synology.me/api/v1/probation/evaluate-result?assign_id={id}"; EvaluateResultAssignResponse evaluate_assign; using (var client = new HttpClient()) { @@ -451,36 +246,23 @@ namespace BMA.EHR.Application.Repositories.Reports if (evaluate_assign.data != null) { - string[] date_start_parts = evaluate_assign.data.assign.date_start.Split('-'); - string[] date_finish_parts = evaluate_assign.data.assign.date_finish.Split('-'); - string[] evaluate_date_start_parts = evaluate_assign.data.evaluate.date_start.Split('-'); - string[] evaluate_date_finish_parts = evaluate_assign.data.evaluate.date_finish.Split('-'); - DateTime currentDate = DateTime.Now; - string[] date_curent_parts = currentDate.ToString("yyyy-MM-dd").Split('-'); - if (string.IsNullOrEmpty(evaluate_assign.data.chairman.Position)) - { - evaluate_assign.data.chairman.Position = string.Empty; - } return new { - No = evaluate_assign.data.evaluate.no, - EvaluateDateStart = ConvertDateMonthYear(evaluate_date_start_parts[0], evaluate_date_start_parts[1], evaluate_date_start_parts[2]), - EvaluateDateFinish = ConvertDateMonthYear(evaluate_date_finish_parts[0], evaluate_date_finish_parts[1], evaluate_date_finish_parts[2]), + EvaluateDateStart = string.IsNullOrEmpty(evaluate_assign.data.evaluate.date_start.ToString()) ? "วันที่ เดือน พ.ศ." : evaluate_assign.data.evaluate.date_start.ToThaiFullDate().ToString().ToThaiNumber(), + EvaluateDateFinish = string.IsNullOrEmpty(evaluate_assign.data.evaluate.date_start.ToString()) ? "วันที่ เดือน พ.ศ." : evaluate_assign.data.evaluate.date_start.ToThaiFullDate().ToString().ToThaiNumber(), Position = string.IsNullOrEmpty(evaluate_assign.data.experimentee.Position) ? string.Empty : evaluate_assign.data.experimentee.Position, Department = string.IsNullOrEmpty(evaluate_assign.data.experimentee.Department) ? string.Empty : evaluate_assign.data.experimentee.Department, OrganizationOrganization = string.IsNullOrEmpty(evaluate_assign.data.experimentee.OrganizationOrganization) ? string.Empty : evaluate_assign.data.experimentee.OrganizationOrganization, Oc = string.IsNullOrEmpty(evaluate_assign.data.experimentee.Oc) ? string.Empty : evaluate_assign.data.experimentee.Oc, - DateStart = ConvertDateMonthYear(date_start_parts[0], date_start_parts[1], date_start_parts[2]), - DateFinish = ConvertDateMonthYear(date_finish_parts[0], date_finish_parts[1], date_finish_parts[2]), Reson = string.IsNullOrEmpty(evaluate_assign.data.evaluate.reson) ? string.Empty : evaluate_assign.data.evaluate.reson, DevelopComplete = evaluate_assign.data.evaluate.develop_complete.ToString() == "1" ? "/" : " ", NotDevelopComplete = evaluate_assign.data.evaluate.develop_complete.ToString() == "0" ? "/" : " ", PassResult = evaluate_assign.data.evaluate.pass_result.ToString() == "1" ? "/" : " ", NotPassResult = evaluate_assign.data.evaluate.pass_result.ToString() == "0" ? "/" : " ", ExpandMonth = string.IsNullOrEmpty(evaluate_assign.data.evaluate.expand_month.ToString()) ? string.Empty : evaluate_assign.data.evaluate.expand_month.ToString().ToThaiNumber(), - ChairmanName = string.IsNullOrEmpty(evaluate_assign.data.chairman.name) ? evaluate_assign.data.chairman.name : string.Empty, - ChairmanPosition = string.IsNullOrEmpty(evaluate_assign.data.chairman.Position) ? evaluate_assign.data.chairman.Position : "-", - ChairmanDate = ConvertDateMonthYear(date_curent_parts[0], date_curent_parts[1], date_curent_parts[2]) + ChairmanName = string.IsNullOrEmpty(evaluate_assign.data.chairman.name) ? string.Empty : evaluate_assign.data.chairman.name, + ChairmanPosition = string.IsNullOrEmpty(evaluate_assign.data.chairman.Position) ? string.Empty : evaluate_assign.data.chairman.Position, + ChairmanDate = string.IsNullOrEmpty(evaluate_assign.data.evaluate.chairman_dated.ToString()) ? "วันที่ เดือน พ.ศ." : evaluate_assign.data.evaluate.chairman_dated.ToThaiFullDate().ToString().ToThaiNumber(), }; } else @@ -492,14 +274,14 @@ namespace BMA.EHR.Application.Repositories.Reports #endregion #region ฟังก์ชั่นแปลงวันเดือนปี - public static string ConvertDateMonthYear(string year, string month, string date) - { - year = year.ToInteger().ToThaiYear().ToString().ToThaiNumber(); - month = month.ToInteger().ToThaiMonth(); - date = date.StartsWith("0") ? date.Substring(1).ToThaiNumber() : date.ToThaiNumber(); + //public static string ConvertDateMonthYear(string year, string month, string date) + //{ + // year = year.ToInteger().ToThaiYear().ToString().ToThaiNumber(); + // month = month.ToInteger().ToThaiMonth(); + // date = date.StartsWith("0") ? date.Substring(1).ToThaiNumber() : date.ToThaiNumber(); - return $"วันที่ {date} เดือน {month} พ.ศ. {year}"; - } + // return $"วันที่ {date} เดือน {month} พ.ศ. {year}"; + //} #endregion #endregion diff --git a/BMA.EHR.Application/Responses/EvaluateAssignResponse.cs b/BMA.EHR.Application/Responses/EvaluateAssignResponse.cs index 19dcebf3..8c9bc4a1 100644 --- a/BMA.EHR.Application/Responses/EvaluateAssignResponse.cs +++ b/BMA.EHR.Application/Responses/EvaluateAssignResponse.cs @@ -10,7 +10,7 @@ namespace BMA.EHR.Application.Responses public class Data { public Experimentee experimentee { get; set; } - public Person person { get; set; } + public Commander commander { get; set; } public Assign assign { get; set; } public Evaluate evaluate { get; set; } } @@ -28,7 +28,7 @@ namespace BMA.EHR.Application.Responses public string Oc { get; set; } = string.Empty; } - public class Person + public class Commander { public string personal_id { get; set; } = string.Empty; public string name { get; set; } = string.Empty; @@ -45,57 +45,227 @@ namespace BMA.EHR.Application.Responses { public string personal_id { get; set; } = string.Empty; public string round_no { get; set; } = string.Empty; - public string date_start { get; set; } = string.Empty; - public string date_finish { get; set; } = string.Empty; - public string behavior_desc { get; set; } = string.Empty; - public string other_desc { get; set; } = string.Empty; - public string other4_desc { get; set; } = string.Empty; - public string other5_no1_desc { get; set; } = string.Empty; - public string other5_no2_desc { get; set; } = string.Empty; - public string experimenter_dated { get; set; } = string.Empty; + public DateTime date_start { get; set; } + public DateTime date_finish { get; set; } } public class Evaluate { - public string id { get; set; } = string.Empty; - public string director_id { get; set; } = string.Empty; - public string assign_id { get; set; } = string.Empty; - public string no { get; set; } = string.Empty; - public string date_start { get; set; } = string.Empty; - public string date_finish { get; set; } = string.Empty; - public string commander_dated { get; set; } = string.Empty; - public int knowledge_level { get; set; } - public int skill_level { get; set; } - public int competency_level { get; set; } - public int learn_level { get; set; } - public int apply_level { get; set; } - public int success_level { get; set; } - public string achievement_other_desc { get; set; } = string.Empty; - public int? achievement_other_level { get; set; } - public string achievement_strength_desc { get; set; } = string.Empty; - public string achievement_improve_desc { get; set; } = string.Empty; - public int conduct1_level { get; set; } - public int conduct2_level { get; set; } - public int conduct3_level { get; set; } - public int conduct4_level { get; set; } - public int moral1_level { get; set; } - public int moral2_level { get; set; } - public int moral3_level { get; set; } - public int discipline1_level { get; set; } - public int discipline2_level { get; set; } - public int discipline3_level { get; set; } - public int discipline4_level { get; set; } - public int discipline5_level { get; set; } - public string behavior_other_desc { get; set; } = string.Empty; - public int? behavior_other_level { get; set; } - public string behavior_strength_desc { get; set; } = string.Empty; - public string behavior_improve_desc { get; set; } = string.Empty; - public int orientation { get; set; } - public int self_learning { get; set; } - public int training_seminar { get; set; } - public int other_training { get; set; } - public string createdAt { get; set; } = string.Empty; - public string updatedAt { get; set; } = string.Empty; + public string id { get; set; } + public int no { get; set; } + public DateTime date_start { get; set; } + public DateTime date_finish { get; set; } + public DateTime sign_dated { get; set; } + public KnowledgeLevel knowledge_level { get; set; } + public SkillLevel skill_level { get; set; } + public CompetencyLevel competency_level { get; set; } + public LearnLevel learn_level { get; set; } + public ApplyLevel apply_level { get; set; } + public SuccessLevel success_level { get; set; } + public string achievement_other_desc { get; set; } + public AchievementOtherLevel achievement_other_level { get; set; } + public Conduct1Level conduct1_level { get; set; } + public Conduct2Level conduct2_level { get; set; } + public Conduct3Level conduct3_level { get; set; } + public Conduct4Level conduct4_level { get; set; } + public Moral1Level moral1_level { get; set; } + public Moral2Level moral2_level { get; set; } + public Moral3Level moral3_level { get; set; } + public Discipline1Level discipline1_level { get; set; } + public Discipline2Level discipline2_level { get; set; } + public Discipline3Level discipline3_level { get; set; } + public Discipline4Level discipline4_level { get; set; } + public Discipline5Level discipline5_level { get; set; } + public BehaviorOtherLevel behavior_other_level { get; set; } + public string behavior_other_desc { get; set; } + public string behavior_strength_desc { get; set; } + public string behavior_improve_desc { get; set; } + public string orientation { get; set; } + public string self_learning { get; set; } + public string training_seminar { get; set; } + public string other_training { get; set; } + public DateTime createdAt { get; set; } + public DateTime updatedAt { get; set; } + } + + public class KnowledgeLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class SkillLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class CompetencyLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class LearnLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class ApplyLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class SuccessLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class AchievementOtherLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class Conduct1Level + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class Conduct2Level + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class Conduct3Level + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class Conduct4Level + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class Moral1Level + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class Moral2Level + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class Moral3Level + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class Discipline1Level + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class Discipline2Level + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class Discipline3Level + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class Discipline4Level + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class Discipline5Level + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class BehaviorOtherLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } } } } diff --git a/BMA.EHR.Application/Responses/EvaluateChairmanAssignResponse.cs b/BMA.EHR.Application/Responses/EvaluateChairmanAssignResponse.cs index 006c297c..78878067 100644 --- a/BMA.EHR.Application/Responses/EvaluateChairmanAssignResponse.cs +++ b/BMA.EHR.Application/Responses/EvaluateChairmanAssignResponse.cs @@ -10,9 +10,9 @@ namespace BMA.EHR.Application.Responses public class Data { public Experimentee experimentee { get; set; } - public List mentors { get; set; } - public Commander commander { get; set; } public Chairman chairman { get; set; } + public Director1 director1 { get; set; } + public Director2 director2 { get; set; } public Assign assign { get; set; } public Evaluate evaluate { get; set; } } @@ -30,94 +30,7 @@ namespace BMA.EHR.Application.Responses public string Oc { get; set; } = string.Empty; } - public class Mentor - { - public string dated { get; set; } - public Profile profile { get; set; } - - } - - public class Commander - { - public string personal_id { get; set; } = string.Empty; - public string name { get; set; } = string.Empty; - public string dated { get; set; } = string.Empty; - public string Position { get; set; } = string.Empty; - } - public class Chairman - { - public string dated { get; set; } - public Profile profile { get; set; } - } - - public class Assign - { - public string personal_id { get; set; } = string.Empty; - public string round_no { get; set; } = string.Empty; - public string date_start { get; set; } = string.Empty; - public string date_finish { get; set; } = string.Empty; - public string behavior_desc { get; set; } = string.Empty; - public string other_desc { get; set; } = string.Empty; - public string other4_desc { get; set; } = string.Empty; - public string other5_no1_desc { get; set; } = string.Empty; - public string other5_no2_desc { get; set; } = string.Empty; - public string experimenter_dated { get; set; } = string.Empty; - } - - public class Evaluate - { - public string id { get; set; } = string.Empty; - public string director_id { get; set; } = string.Empty; - public string assign_id { get; set; } = string.Empty; - public string no { get; set; } = string.Empty; - public string date_start { get; set; } = string.Empty; - public string date_finish { get; set; } = string.Empty; - public string chairman_dated { get; set; } = string.Empty; - public int knowledge_level { get; set; } - public int apply_level { get; set; } - public int success_level { get; set; } - public string achievement_other_desc { get; set; } = string.Empty; - public int? achievement_other_level { get; set; } - public int conduct1_level { get; set; } - public int conduct2_level { get; set; } - public int conduct3_level { get; set; } - public int conduct4_level { get; set; } - public int moral1_level { get; set; } - public int moral2_level { get; set; } - public int moral3_level { get; set; } - public int discipline1_level { get; set; } - public int discipline2_level { get; set; } - public int discipline3_level { get; set; } - public int discipline4_level { get; set; } - public int discipline5_level { get; set; } - public string behavior_other_desc { get; set; } = string.Empty; - public int? behavior_other_level { get; set; } - public int achievement_score { get; set; } - public int achievement_score_total { get; set; } - public int achievement_percent { get; set; } - public int achievement_result { get; set; } - public int behavior_score { get; set; } - public int behavior_score_total { get; set; } - public double behavior_percent { get; set; } - public int behavior_result { 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_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_result { get; set; } - public int sum_score { get; set; } - public double sum_percent { get; set; } - public int evaluate_result { get; set; } - public string createdAt { get; set; } = string.Empty; - public string updatedAt { get; set; } = string.Empty; - } - - public class Profile { public string personal_id { get; set; } = string.Empty; public string name { get; set; } = string.Empty; @@ -129,5 +42,164 @@ namespace BMA.EHR.Application.Responses public string Department { get; set; } = string.Empty; public string Oc { get; set; } = string.Empty; } + + public class Director1 + { + 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 class Director2 + { + 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 class Assign + { + public string personal_id { get; set; } = string.Empty; + public string round_no { get; set; } = string.Empty; + public DateTime date_start { get; set; } + public DateTime date_finish { get; set; } + } + + public class Evaluate + { + public string id { get; set; } + public int no { get; set; } + public DateTime date_start { get; set; } + public DateTime date_finish { get; set; } + public DateTime chairman_dated { get; set; } + public DateTime director1_dated { get; set; } + public DateTime director2_dated { get; set; } + public KnowledgeLevel knowledge_level { get; set; } + public ApplyLevel apply_level { get; set; } + public SuccessLevel success_level { get; set; } + public string achievement_other_desc { get; set; } + public AchievementOtherLevel achievement_other_level { get; set; } + public ConductLevel conduct1_level { get; set; } + public ConductLevel conduct2_level { get; set; } + public ConductLevel conduct3_level { get; set; } + public ConductLevel conduct4_level { get; set; } + public MoralLevel moral1_level { get; set; } + public MoralLevel moral2_level { get; set; } + public MoralLevel moral3_level { get; set; } + public DisciplineLevel discipline1_level { get; set; } + public DisciplineLevel discipline2_level { get; set; } + public DisciplineLevel discipline3_level { get; set; } + public DisciplineLevel discipline4_level { get; set; } + 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 int achievement_score_total { get; set; } + public double achievement_percent { get; set; } + public int achievement_result { get; set; } + public int behavior_score { get; set; } + public int behavior_score_total { get; set; } + public double 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 int develop_result { get; set; } + public DateTime createdAt { get; set; } + public DateTime updatedAt { get; set; } + } + + public class KnowledgeLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class ApplyLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class SuccessLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class AchievementOtherLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class ConductLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class MoralLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class DisciplineLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class BehaviorLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } } } diff --git a/BMA.EHR.Application/Responses/EvaluateRecordAssignResponse.cs b/BMA.EHR.Application/Responses/EvaluateRecordAssignResponse.cs index 0d91efd6..21993ed6 100644 --- a/BMA.EHR.Application/Responses/EvaluateRecordAssignResponse.cs +++ b/BMA.EHR.Application/Responses/EvaluateRecordAssignResponse.cs @@ -10,97 +10,202 @@ namespace BMA.EHR.Application.Responses public class Data { public Experimentee experimentee { get; set; } - public Person person { get; set; } + public Director director { get; set; } public Assign assign { get; set; } - public List evaluate { get; set; } + public Evaluate evaluate { get; set; } } public class Experimentee { - public string personal_id { get; set; } = string.Empty; - public string name { get; set; } = string.Empty; - public string PositionId { get; set; } = string.Empty; - public string PositionLevelId { get; set; } = string.Empty; - public string PositionLineId { get; set; } = string.Empty; - public string OrganizationOrganization { get; set; } = string.Empty; - public string Position { get; set; } = string.Empty; - public string Department { get; set; } = string.Empty; - public string Oc { get; set; } = string.Empty; + 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 class Person + public class Director { - public string personal_id { get; set; } = string.Empty; - public string name { get; set; } = string.Empty; - public string PositionId { get; set; } = string.Empty; - public string PositionLevelId { get; set; } = string.Empty; - public string PositionLineId { get; set; } = string.Empty; - public string OrganizationOrganization { get; set; } = string.Empty; - public string Position { get; set; } = string.Empty; - public string Department { get; set; } = string.Empty; - public string Oc { get; set; } = string.Empty; + 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 class Assign { - public string date_start { get; set; } = string.Empty; - public string date_finish { get; set; } = string.Empty; - public string behavior_desc { get; set; } = string.Empty; - public string other_desc { get; set; } = string.Empty; - public string other4_desc { get; set; } = string.Empty; - public string other5_no1_desc { get; set; } = string.Empty; - public string other5_no2_desc { get; set; } = string.Empty; - public string experimenter_dated { get; set; } = string.Empty; + public string id { get; set; } + public string personal_id { get; set; } + public string round_no { get; set; } + public DateTime date_start { get; set; } + public DateTime date_finish { get; set; } } public class Evaluate { - public string id { get; set; } = string.Empty; - public string director_id { get; set; } = string.Empty; - public string assign_id { get; set; } = string.Empty; - public string no { get; set; } = string.Empty; - public string date_start { get; set; } = string.Empty; - public string date_finish { get; set; } = string.Empty; - public string assessor_dated { get; set; } = string.Empty; - public int knowledge_level { get; set; } - public int skill_level { get; set; } - public int competency_level { get; set; } - public int learn_level { get; set; } - public int apply_level { get; set; } - public string achievement_other_desc { get; set; } = string.Empty; - public int? achievement_other_level { get; set; } - public string achievement_strength_desc { get; set; } = string.Empty; - public string achievement_improve_desc { get; set; } = string.Empty; - public int conduct1_level { get; set; } - public int conduct2_level { get; set; } - public int conduct3_level { get; set; } - public int conduct4_level { get; set; } - public int moral1_level { get; set; } - public int moral2_level { get; set; } - public int moral3_level { get; set; } - public int discipline1_level { get; set; } - public int discipline2_level { get; set; } - public int discipline3_level { get; set; } - public int discipline4_level { get; set; } - public int discipline5_level { get; set; } - public string behavior_other_desc { get; set; } = string.Empty; - public int? behavior_other_level { get; set; } - public string behavior_strength_desc { get; set; } = string.Empty; - public string behavior_improve_desc { get; set; } = string.Empty; - public int orientation { get; set; } - public int self_learning { get; set; } - public int training_seminar { get; set; } - public int other_training { get; set; } - public string createdAt { get; set; } = string.Empty; - public string updatedAt { get; set; } = string.Empty; - public List achievements { get; set; } + public string id { get; set; } + public string no { get; set; } + public DateTime date_start { get; set; } + public DateTime date_finish { get; set; } + public DateTime sign_dated { get; set; } + public KnowledgeLevel knowledge_level { get; set; } + public SkillLevel skill_level { get; set; } + public CompetencyLevel competency_level { get; set; } + public LearnLevel learn_level { get; set; } + public ApplyLevel apply_level { get; set; } + public AchievementOtherLevel achievement_other_level { get; set; } + public string achievement_other_desc { get; set; } + public string achievement_strength_desc { get; set; } + public string achievement_improve_desc { get; set; } + public ConductLevel conduct1_level { get; set; } + public ConductLevel conduct2_level { get; set; } + public ConductLevel conduct3_level { get; set; } + public ConductLevel conduct4_level { get; set; } + public MoralLevel moral1_level { get; set; } + public MoralLevel moral2_level { get; set; } + public MoralLevel moral3_level { get; set; } + public DisciplineLevel discipline1_level { get; set; } + public DisciplineLevel discipline2_level { get; set; } + public DisciplineLevel discipline3_level { get; set; } + public DisciplineLevel discipline4_level { get; set; } + public DisciplineLevel discipline5_level { get; set; } + public BehaviorLevel behavior_other_level { get; set; } + public string behavior_other_desc { get; set; } + public string behavior_strength_desc { get; set; } + public string behavior_improve_desc { get; set; } + public string orientation { get; set; } + public string self_learning { get; set; } + public string training_seminar { get; set; } + public string other_training { get; set; } + public string role { get; set; } + public DateTime createdAt { get; set; } + public DateTime updatedAt { get; set; } + public List achievements { get; set; } } - public class Achievements + + public class Achievement { - public string evaluate_expect_desc { get; set; } = string.Empty; - public int evaluate_expect_level { get; set; } - public string evaluate_output_desc { get; set; } = string.Empty; - public int evaluate_output_level { get; set; } + public string evaluate_expect_desc { get; set; } + public EvaluateExpectLevel evaluate_expect_level { get; set; } + public string evaluate_output_desc { get; set; } + public EvaluateOutputLevel evaluate_output_level { get; set; } + } + + public class EvaluateExpectLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class EvaluateOutputLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class KnowledgeLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class SkillLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class CompetencyLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class LearnLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class ApplyLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class AchievementOtherLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class ConductLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class MoralLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class DisciplineLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } + } + + public class BehaviorLevel + { + public string col1 { get; set; } + public string col2 { get; set; } + public string col3 { get; set; } + public string col4 { get; set; } + public string col5 { get; set; } } } } diff --git a/BMA.EHR.Application/Responses/EvaluateResultAssignResponse.cs b/BMA.EHR.Application/Responses/EvaluateResultAssignResponse.cs index 7d269983..1729e46c 100644 --- a/BMA.EHR.Application/Responses/EvaluateResultAssignResponse.cs +++ b/BMA.EHR.Application/Responses/EvaluateResultAssignResponse.cs @@ -93,15 +93,15 @@ namespace BMA.EHR.Application.Responses public string director_id { get; set; } public string assign_id { get; set; } public int no { get; set; } - public string date_start { get; set; } - public string date_finish { get; set; } + public DateTime date_start { get; set; } + public DateTime date_finish { get; set; } public int develop_complete { get; set; } public int pass_result { get; set; } public int expand_month { get; set; } public string reson { get; set; } - public string chairman_dated { get; set; } - public string director1_dated { get; set; } - public string director2_dated { get; set; } + public DateTime chairman_dated { get; set; } + public DateTime director1_dated { get; set; } + public DateTime director2_dated { get; set; } public string createdAt { get; set; } public string updatedAt { get; set; } } diff --git a/BMA.EHR.Application/Responses/ProbationAssignResponse.cs b/BMA.EHR.Application/Responses/ProbationAssignResponse.cs index 73830dee..fa0d928a 100644 --- a/BMA.EHR.Application/Responses/ProbationAssignResponse.cs +++ b/BMA.EHR.Application/Responses/ProbationAssignResponse.cs @@ -32,8 +32,8 @@ public class Assign { - public string date_start { get; set; } = string.Empty; - public string date_finish { get; set; } = string.Empty; + public DateTime date_start { get; set; } + public DateTime date_finish { get; set; } public string behavior_desc { get; set; } = string.Empty; public string other_desc { get; set; } = string.Empty; public string other4_desc { get; set; } = string.Empty; @@ -46,7 +46,7 @@ { public string personal_id { get; set; } = string.Empty; public string name { get; set; } = string.Empty; - public string dated { get; set; } = string.Empty; + public DateTime dated { get; set; } public string Position { get; set; } = string.Empty; } @@ -54,7 +54,7 @@ { public string personal_id { get; set; } = string.Empty; public string name { get; set; } = string.Empty; - public string dated { get; set; } = string.Empty; + public DateTime dated { get; set; } public string Position { get; set; } = string.Empty; } diff --git a/BMA.EHR.Report.Service/Controllers/ProbationReportController.cs b/BMA.EHR.Report.Service/Controllers/ProbationReportController.cs index 036b15eb..5e8d08d1 100644 --- a/BMA.EHR.Report.Service/Controllers/ProbationReportController.cs +++ b/BMA.EHR.Report.Service/Controllers/ProbationReportController.cs @@ -12,6 +12,11 @@ using Telerik.Reporting.Processing; using System.IO; using Newtonsoft.Json; using BMA.EHR.Application.Responses; +using static BMA.EHR.Application.Responses.EvaluateRecordAssignResponse; +using static BMA.EHR.Application.Responses.ProbationAssignResponse; +using DocumentFormat.OpenXml.Drawing.Charts; +using DocumentFormat.OpenXml.Bibliography; +using DocumentFormat.OpenXml.Wordprocessing; namespace BMA.EHR.Report.Service.Controllers { @@ -19,7 +24,7 @@ namespace BMA.EHR.Report.Service.Controllers [ApiVersion("2.0")] [ApiController] [Produces("application/json")] - //[Authorize] + [Authorize] [SwaggerTag("API รายงานระบทดลองงาน")] public class ProbationReportController : BaseController { @@ -232,9 +237,9 @@ namespace BMA.EHR.Report.Service.Controllers } #endregion - #region 14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล + #region 14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล และ ผู้บังคับบัญชา /// - /// 14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล + /// 14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล และ ผู้บังคับบัญชา /// /// id /// pdf, docx หรือ xlsx @@ -266,171 +271,7 @@ namespace BMA.EHR.Report.Service.Controllers } var rptFile = System.IO.Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล-1.trdp"); - //var rptFile2 = System.IO.Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล-2.trdp"); - var rptFile3 = System.IO.Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล-3.trdp"); - - ReportPackager reportPacker = new ReportPackager(); - Telerik.Reporting.Report? report = null; - //Telerik.Reporting.Report? report2 = null; - Telerik.Reporting.Report? report3 = null; - - using (var sourceStream = System.IO.File.OpenRead(rptFile)) - //using (var sourceStream2 = System.IO.File.OpenRead(rptFile2)) - using (var sourceStream3 = System.IO.File.OpenRead(rptFile3)) - { - report = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream); - //report2 = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream2); - report3 = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream3); - } - - report.ReportParameters["Name"].Value = evaluateRecord.GetType().GetProperty("Name").GetValue(evaluateRecord); - report.ReportParameters["Position"].Value = evaluateRecord.GetType().GetProperty("Position").GetValue(evaluateRecord); - report.ReportParameters["ExperimenteeName"].Value = evaluateRecord.GetType().GetProperty("ExperimenteeName").GetValue(evaluateRecord); - report.ReportParameters["ExperimenteePosition"].Value = evaluateRecord.GetType().GetProperty("ExperimenteePosition").GetValue(evaluateRecord); - report.ReportParameters["Department"].Value = evaluateRecord.GetType().GetProperty("Department").GetValue(evaluateRecord); - report.ReportParameters["OrganizationOrganization"].Value = evaluateRecord.GetType().GetProperty("OrganizationOrganization").GetValue(evaluateRecord); - report.ReportParameters["Oc"].Value = evaluateRecord.GetType().GetProperty("Oc").GetValue(evaluateRecord); - report.ReportParameters["DateStart"].Value = evaluateRecord.GetType().GetProperty("DateStart").GetValue(evaluateRecord); - report.ReportParameters["DateFinish"].Value = evaluateRecord.GetType().GetProperty("DateFinish").GetValue(evaluateRecord); - report.ReportParameters["AchievementStrengthDesc1"].Value = evaluateRecord.GetType().GetProperty("AchievementStrengthDesc1").GetValue(evaluateRecord); - report.ReportParameters["AchievementStrengthDesc2"].Value = evaluateRecord.GetType().GetProperty("AchievementStrengthDesc2").GetValue(evaluateRecord); - report.ReportParameters["AchievementStrengthDesc3"].Value = evaluateRecord.GetType().GetProperty("AchievementStrengthDesc3").GetValue(evaluateRecord); - report.ReportParameters["AchievementImproveDesc1"].Value = evaluateRecord.GetType().GetProperty("AchievementImproveDesc1").GetValue(evaluateRecord); - report.ReportParameters["AchievementImproveDesc2"].Value = evaluateRecord.GetType().GetProperty("AchievementImproveDesc2").GetValue(evaluateRecord); - report.ReportParameters["AchievementImproveDesc3"].Value = evaluateRecord.GetType().GetProperty("AchievementImproveDesc3").GetValue(evaluateRecord); - report3.ReportParameters["BehaviorStrengthDesc1"].Value = evaluateRecord.GetType().GetProperty("BehaviorStrengthDesc1").GetValue(evaluateRecord); - report3.ReportParameters["BehaviorStrengthDesc2"].Value = evaluateRecord.GetType().GetProperty("BehaviorStrengthDesc2").GetValue(evaluateRecord); - report3.ReportParameters["BehaviorStrengthDesc3"].Value = evaluateRecord.GetType().GetProperty("BehaviorStrengthDesc3").GetValue(evaluateRecord); - report3.ReportParameters["BehaviorImproveDesc1"].Value = evaluateRecord.GetType().GetProperty("BehaviorImproveDesc1").GetValue(evaluateRecord); - report3.ReportParameters["BehaviorImproveDesc2"].Value = evaluateRecord.GetType().GetProperty("BehaviorImproveDesc2").GetValue(evaluateRecord); - report3.ReportParameters["BehaviorImproveDesc3"].Value = evaluateRecord.GetType().GetProperty("BehaviorImproveDesc3").GetValue(evaluateRecord); - report3.ReportParameters["Name"].Value = evaluateRecord.GetType().GetProperty("Name").GetValue(evaluateRecord); - report3.ReportParameters["Position"].Value = evaluateRecord.GetType().GetProperty("Position").GetValue(evaluateRecord); - report3.ReportParameters["MentorDate"].Value = evaluateRecord.GetType().GetProperty("MentorDate").GetValue(evaluateRecord); - - var _evaluateslist = new List(); - dynamic evaluates = evaluateRecord.GetType().GetProperty("Evaluates").GetValue(evaluateRecord); - foreach (var evaluate in evaluates) - { - string Evaluate_expect_desc = string.Empty; - string Evaluate_output_desc = string.Empty; - int Evaluate_expect_level = 0; - int Evaluate_output_level = 0; - string Check_expect1 = string.Empty; - string Check_expect2 = string.Empty; - string Check_expect3 = string.Empty; - string Check_expect4 = string.Empty; - string Check_expect5 = string.Empty; - string Check_output1 = string.Empty; - string Check_output2 = string.Empty; - string Check_output3 = string.Empty; - string Check_output4 = string.Empty; - string Check_output5 = string.Empty; - var achievements = evaluate.achievements; - foreach (var achievement in achievements) - { - Evaluate_expect_desc = achievement.evaluate_expect_desc; - Evaluate_output_desc = achievement.evaluate_output_desc; - Evaluate_expect_level = achievement.evaluate_expect_level; - Evaluate_output_level = achievement.evaluate_output_level; - } - _evaluateslist.Add(new - { - No = evaluate.no, - Date_start = evaluate.date_start, - Date_finish = evaluate.date_finish, - Evaluate_expect_desc = $" - {Evaluate_expect_desc}", - Evaluate_output_desc = $" - {Evaluate_output_desc}", - Check_expect1 = Evaluate_expect_level == 1 ? "/" : string.Empty, - Check_expect2 = Evaluate_expect_level == 2 ? "/" : string.Empty, - Check_expect3 = Evaluate_expect_level == 3 ? "/" : string.Empty, - Check_expect4 = Evaluate_expect_level == 4 ? "/" : string.Empty, - Check_expect5 = Evaluate_expect_level == 5 ? "/" : string.Empty, - Check_output1 = Evaluate_output_level == 1 ? "/" : string.Empty, - Check_output2 = Evaluate_output_level == 2 ? "/" : string.Empty, - Check_output3 = Evaluate_output_level == 3 ? "/" : string.Empty, - Check_output4 = Evaluate_output_level == 4 ? "/" : string.Empty, - Check_output5 = Evaluate_output_level == 5 ? "/" : string.Empty, - ApplyLevel = evaluate.apply_level, - AchievementStrengthDesc = evaluate.achievement_strength_desc, - AchievementImproveDesc = evaluate.achievement_improve_desc, - - }); - } - var tblEvaluate_1 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table2"]; - tblEvaluate_1.DataSource = _evaluateslist; - - var tblEvaluate_2 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table1"]; - tblEvaluate_2.DataSource = _evaluateslist; - - var reportBook = new ReportBook(); - reportBook.Reports.Add(report); - //reportBook.Reports.Add(report2); - reportBook.Reports.Add(report3); - - System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); - InstanceReportSource instanceReportSource = new InstanceReportSource() - { - ReportDocument = reportBook, - }; - - ReportProcessor reportProcessor = new ReportProcessor(_configuration); - RenderingResult result = reportProcessor.RenderReport($"{exportType}", instanceReportSource, deviceInfo); - var content = result.DocumentBytes; - return File(content, mimeType, $"แบบบันทึกผล(สำหรับผู้ดูแล).{exportType.Trim().ToLower()}"); - } - else - { - return NotFound(); - } - } - else - { - return Unauthorized(); - } - } - catch - { - throw; - } - } - #endregion - - #region 15-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้บังคับบัญชา - /// - /// 15-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้บังคับบัญชา - /// - /// id - /// pdf, docx หรือ xlsx - /// - /// เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ - /// ไม่ได้ Login เข้าระบบ - /// เมื่อเกิดข้อผิดพลาดในการทำงาน - [HttpGet("15/{exportType}/{id}")] - public async Task> GetProbation15ConvertReportAsync(Guid id, string exportType = "pdf") - { - try - { - string authorizationHeader = Request.Headers["Authorization"]; - string token = string.Empty; - - if (!string.IsNullOrEmpty(authorizationHeader) && authorizationHeader.StartsWith("Bearer ")) - { - token = authorizationHeader.Substring("Bearer ".Length).Trim(); - var evaluateRecord = await _repository.GetEvaluateRecordAsync(id, token); - - if (evaluateRecord != null) - { - var mimeType = ""; - switch (exportType.Trim().ToLower()) - { - case "pdf": mimeType = "application/pdf"; break; - case "docx": mimeType = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"; break; - case "xlsx": mimeType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; break; - } - - var rptFile = System.IO.Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"15-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้บังคับบัญชา-1.trdp"); - var rptFile2 = System.IO.Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"15-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้บังคับบัญชา-2.trdp"); + var rptFile2 = System.IO.Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล-2.trdp"); ReportPackager reportPacker = new ReportPackager(); Telerik.Reporting.Report? report = null; @@ -443,86 +284,198 @@ namespace BMA.EHR.Report.Service.Controllers report2 = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream2); } + report.ReportParameters["DirectorName"].Value = evaluateRecord.GetType().GetProperty("DirectorName").GetValue(evaluateRecord); + report.ReportParameters["DirectorPosition"].Value = evaluateRecord.GetType().GetProperty("DirectorPosition").GetValue(evaluateRecord); report.ReportParameters["Name"].Value = evaluateRecord.GetType().GetProperty("Name").GetValue(evaluateRecord); report.ReportParameters["Position"].Value = evaluateRecord.GetType().GetProperty("Position").GetValue(evaluateRecord); - report.ReportParameters["ExperimenteeName"].Value = evaluateRecord.GetType().GetProperty("ExperimenteeName").GetValue(evaluateRecord); - report.ReportParameters["ExperimenteePosition"].Value = evaluateRecord.GetType().GetProperty("ExperimenteePosition").GetValue(evaluateRecord); report.ReportParameters["Department"].Value = evaluateRecord.GetType().GetProperty("Department").GetValue(evaluateRecord); - report.ReportParameters["OrganizationOrganization"].Value = evaluateRecord.GetType().GetProperty("OrganizationOrganization").GetValue(evaluateRecord); + report.ReportParameters["OrganizationOrganization"].Value = evaluateRecord.GetType().GetProperty("Organizationorganization").GetValue(evaluateRecord); report.ReportParameters["Oc"].Value = evaluateRecord.GetType().GetProperty("Oc").GetValue(evaluateRecord); report.ReportParameters["DateStart"].Value = evaluateRecord.GetType().GetProperty("DateStart").GetValue(evaluateRecord); report.ReportParameters["DateFinish"].Value = evaluateRecord.GetType().GetProperty("DateFinish").GetValue(evaluateRecord); - report.ReportParameters["AchievementStrengthDesc1"].Value = evaluateRecord.GetType().GetProperty("AchievementStrengthDesc1").GetValue(evaluateRecord); - report.ReportParameters["AchievementStrengthDesc2"].Value = evaluateRecord.GetType().GetProperty("AchievementStrengthDesc2").GetValue(evaluateRecord); - report.ReportParameters["AchievementStrengthDesc3"].Value = evaluateRecord.GetType().GetProperty("AchievementStrengthDesc3").GetValue(evaluateRecord); - report.ReportParameters["AchievementImproveDesc1"].Value = evaluateRecord.GetType().GetProperty("AchievementImproveDesc1").GetValue(evaluateRecord); - report.ReportParameters["AchievementImproveDesc2"].Value = evaluateRecord.GetType().GetProperty("AchievementImproveDesc2").GetValue(evaluateRecord); - report.ReportParameters["AchievementImproveDesc3"].Value = evaluateRecord.GetType().GetProperty("AchievementImproveDesc3").GetValue(evaluateRecord); - report2.ReportParameters["BehaviorStrengthDesc1"].Value = evaluateRecord.GetType().GetProperty("BehaviorStrengthDesc1").GetValue(evaluateRecord); - report2.ReportParameters["BehaviorStrengthDesc2"].Value = evaluateRecord.GetType().GetProperty("BehaviorStrengthDesc2").GetValue(evaluateRecord); - report2.ReportParameters["BehaviorStrengthDesc3"].Value = evaluateRecord.GetType().GetProperty("BehaviorStrengthDesc3").GetValue(evaluateRecord); - report2.ReportParameters["BehaviorImproveDesc1"].Value = evaluateRecord.GetType().GetProperty("BehaviorImproveDesc1").GetValue(evaluateRecord); - report2.ReportParameters["BehaviorImproveDesc2"].Value = evaluateRecord.GetType().GetProperty("BehaviorImproveDesc2").GetValue(evaluateRecord); - report2.ReportParameters["BehaviorImproveDesc3"].Value = evaluateRecord.GetType().GetProperty("BehaviorImproveDesc3").GetValue(evaluateRecord); - report2.ReportParameters["Name"].Value = evaluateRecord.GetType().GetProperty("Name").GetValue(evaluateRecord); - report2.ReportParameters["Position"].Value = evaluateRecord.GetType().GetProperty("Position").GetValue(evaluateRecord); - report2.ReportParameters["MentorDate"].Value = evaluateRecord.GetType().GetProperty("MentorDate").GetValue(evaluateRecord); - - var _evaluateslist = new List(); - dynamic evaluates = evaluateRecord.GetType().GetProperty("Evaluates").GetValue(evaluateRecord); - foreach (var evaluate in evaluates) + report.ReportParameters["No"].Value = evaluateRecord.GetType().GetProperty("No").GetValue(evaluateRecord); + report.ReportParameters["EvaluateDateStart"].Value = evaluateRecord.GetType().GetProperty("EvaluateDateStart").GetValue(evaluateRecord); + report.ReportParameters["EvaluateDateFinish"].Value = evaluateRecord.GetType().GetProperty("EvaluateDateFinish").GetValue(evaluateRecord); + report.ReportParameters["Role"].Value = evaluateRecord.GetType().GetProperty("Role").GetValue(evaluateRecord); + report2.ReportParameters["Role"].Value = evaluateRecord.GetType().GetProperty("Role").GetValue(evaluateRecord); + report2.ReportParameters["DirectorName"].Value = evaluateRecord.GetType().GetProperty("DirectorName").GetValue(evaluateRecord); + report2.ReportParameters["DirectorPosition"].Value = evaluateRecord.GetType().GetProperty("DirectorPosition").GetValue(evaluateRecord); + report2.ReportParameters["DirectorDated"].Value = evaluateRecord.GetType().GetProperty("DirectorDated").GetValue(evaluateRecord); + //1.1 + var _Achievementslist = new List(); + dynamic Achievements = evaluateRecord.GetType().GetProperty("Achievements").GetValue(evaluateRecord); + foreach (var achievements in Achievements) { - string Evaluate_expect_desc = string.Empty; - string Evaluate_output_desc = string.Empty; - int Evaluate_expect_level = 0; - int Evaluate_output_level = 0; - string Check_expect1 = string.Empty; - string Check_expect2 = string.Empty; - string Check_expect3 = string.Empty; - string Check_expect4 = string.Empty; - string Check_expect5 = string.Empty; - string Check_output1 = string.Empty; - string Check_output2 = string.Empty; - string Check_output3 = string.Empty; - string Check_output4 = string.Empty; - string Check_output5 = string.Empty; - var achievements = evaluate.achievements; - foreach (var achievement in achievements) + _Achievementslist.Add(new { - Evaluate_expect_desc = achievement.evaluate_expect_desc; - Evaluate_output_desc = achievement.evaluate_output_desc; - Evaluate_expect_level = achievement.evaluate_expect_level; - Evaluate_output_level = achievement.evaluate_output_level; - } - _evaluateslist.Add(new - { - No = evaluate.no, - Date_start = evaluate.date_start, - Date_finish = evaluate.date_finish, - Evaluate_expect_desc = $" - {Evaluate_expect_desc}", - Evaluate_output_desc = $" - {Evaluate_output_desc}", - Check_expect1 = Evaluate_expect_level == 1 ? "/" : string.Empty, - Check_expect2 = Evaluate_expect_level == 2 ? "/" : string.Empty, - Check_expect3 = Evaluate_expect_level == 3 ? "/" : string.Empty, - Check_expect4 = Evaluate_expect_level == 4 ? "/" : string.Empty, - Check_expect5 = Evaluate_expect_level == 5 ? "/" : string.Empty, - Check_output1 = Evaluate_output_level == 1 ? "/" : string.Empty, - Check_output2 = Evaluate_output_level == 2 ? "/" : string.Empty, - Check_output3 = Evaluate_output_level == 3 ? "/" : string.Empty, - Check_output4 = Evaluate_output_level == 4 ? "/" : string.Empty, - Check_output5 = Evaluate_output_level == 5 ? "/" : string.Empty, - ApplyLevel = evaluate.apply_level, - AchievementStrengthDesc = evaluate.achievement_strength_desc, - AchievementImproveDesc = evaluate.achievement_improve_desc, - + evaluate_expect_desc = achievements.evaluate_expect_desc, + expectCol1 = achievements.evaluate_expect_level.col1, + expectCol2 = achievements.evaluate_expect_level.col2, + expectCol3 = achievements.evaluate_expect_level.col3, + expectCol4 = achievements.evaluate_expect_level.col4, + expectCol5 = achievements.evaluate_expect_level.col5, + evaluate_output_desc = achievements.evaluate_output_desc, + outputCol1 = achievements.evaluate_output_level.col1, + outputCol2 = achievements.evaluate_output_level.col2, + outputCol3 = achievements.evaluate_output_level.col3, + outputCol4 = achievements.evaluate_output_level.col4, + outputCol5 = achievements.evaluate_output_level.col5, }); } + var tblEvaluate1 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table1"]; + tblEvaluate1.DataSource = _Achievementslist; + //1.2 ... 1.7 + var _Evaluatelist = new List(); + dynamic evaluate = evaluateRecord.GetType().GetProperty("Evaluate").GetValue(evaluateRecord); + dynamic knowledge = evaluate.knowledge_level; + dynamic skill = evaluate.skill_level; + dynamic competency = evaluate.competency_level; + dynamic learn = evaluate.learn_level; + dynamic apply = evaluate.apply_level; + dynamic achievement = evaluate.achievement_other_level; + string achievement_other_desc = evaluate.achievement_other_desc; + string achievement_strength_desc = evaluate.achievement_strength_desc; + string achievement_improve_desc = evaluate.achievement_improve_desc; + //2.1 ... 2.4 + dynamic conduct1 = evaluate.conduct1_level; + dynamic conduct2 = evaluate.conduct2_level; + dynamic conduct3 = evaluate.conduct3_level; + dynamic conduct4 = evaluate.conduct4_level; + dynamic moral1 = evaluate.moral1_level; + dynamic moral2 = evaluate.moral2_level; + dynamic moral3 = evaluate.moral3_level; + dynamic discipline1 = evaluate.discipline1_level; + dynamic discipline2 = evaluate.discipline2_level; + dynamic discipline3 = evaluate.discipline3_level; + dynamic discipline4 = evaluate.discipline4_level; + dynamic discipline5 = evaluate.discipline5_level; + dynamic behavior = evaluate.behavior_other_level; + string behavior_other_desc = evaluate.behavior_other_desc; + string behavior_strength_desc = evaluate.behavior_strength_desc; + string behavior_improve_desc = evaluate.behavior_improve_desc; + string orientation = evaluate.orientation; + string self_learning = evaluate.self_learning; + string training_seminar = evaluate.training_seminar; + string other_training = evaluate.other_training; + _Evaluatelist.Add(new + { + knowledge_col1 = knowledge.col1, + knowledge_col2 = knowledge.col2, + knowledge_col3 = knowledge.col3, + knowledge_col4 = knowledge.col4, + knowledge_col5 = knowledge.col5, + skill_col1 = skill.col1, + skill_col2 = skill.col2, + skill_col3 = skill.col3, + skill_col4 = skill.col4, + skill_col5 = skill.col5, + competency_col1 = competency.col1, + competency_col2 = competency.col2, + competency_col3 = competency.col3, + competency_col4 = competency.col4, + competency_col5 = competency.col5, + learn_col1 = learn.col1, + learn_col2 = learn.col2, + learn_col3 = learn.col3, + learn_col4 = learn.col4, + learn_col5 = learn.col5, + apply_col1 = apply.col1, + apply_col2 = apply.col2, + apply_col3 = apply.col3, + apply_col4 = apply.col4, + apply_col5 = apply.col5, + achievement_col1 = achievement.col1, + achievement_col2 = achievement.col2, + achievement_col3 = achievement.col3, + achievement_col4 = achievement.col4, + achievement_col5 = achievement.col5, + achievement_other_desc, + achievement_strength_desc, + achievement_improve_desc, + conduct1_col1 = conduct1.col1, + conduct1_col2 = conduct1.col2, + conduct1_col3 = conduct1.col3, + conduct1_col4 = conduct1.col4, + conduct1_col5 = conduct1.col5, + conduct2_col1 = conduct2.col1, + conduct2_col2 = conduct2.col2, + conduct2_col3 = conduct2.col3, + conduct2_col4 = conduct2.col4, + conduct2_col5 = conduct2.col5, + conduct3_col1 = conduct3.col1, + conduct3_col2 = conduct3.col2, + conduct3_col3 = conduct3.col3, + conduct3_col4 = conduct3.col4, + conduct3_col5 = conduct3.col5, + conduct4_col1 = conduct4.col1, + conduct4_col2 = conduct4.col2, + conduct4_col3 = conduct4.col3, + conduct4_col4 = conduct4.col4, + conduct4_col5 = conduct4.col5, + moral1_col1 = moral1.col1, + moral1_col2 = moral1.col2, + moral1_col3 = moral1.col3, + moral1_col4 = moral1.col4, + moral1_col5 = moral1.col5, + moral2_col1 = moral2.col1, + moral2_col2 = moral2.col2, + moral2_col3 = moral2.col3, + moral2_col4 = moral2.col4, + moral2_col5 = moral2.col5, + moral3_col1 = moral3.col1, + moral3_col2 = moral3.col2, + moral3_col3 = moral3.col3, + moral3_col4 = moral3.col4, + moral3_col5 = moral3.col5, + discipline1_col1 = discipline1.col1, + discipline1_col2 = discipline1.col2, + discipline1_col3 = discipline1.col3, + discipline1_col4 = discipline1.col4, + discipline1_col5 = discipline1.col5, + discipline2_col1 = discipline2.col1, + discipline2_col2 = discipline2.col2, + discipline2_col3 = discipline2.col3, + discipline2_col4 = discipline2.col4, + discipline2_col5 = discipline2.col5, + discipline3_col1 = discipline3.col1, + discipline3_col2 = discipline3.col2, + discipline3_col3 = discipline3.col3, + discipline3_col4 = discipline3.col4, + discipline3_col5 = discipline3.col5, + discipline4_col1 = discipline4.col1, + discipline4_col2 = discipline4.col2, + discipline4_col3 = discipline4.col3, + discipline4_col4 = discipline4.col4, + discipline4_col5 = discipline4.col5, + discipline5_col1 = discipline5.col1, + discipline5_col2 = discipline5.col2, + discipline5_col3 = discipline5.col3, + discipline5_col4 = discipline5.col4, + discipline5_col5 = discipline5.col5, + behavior_col1 = behavior.col1, + behavior_col2 = behavior.col2, + behavior_col3 = behavior.col3, + behavior_col4 = behavior.col4, + behavior_col5 = behavior.col5, + behavior_other_desc, + behavior_strength_desc, + behavior_improve_desc, + orientation, + self_learning, + training_seminar, + other_training, + }); - var tblEvaluate_1 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table2"]; - tblEvaluate_1.DataSource = _evaluateslist; - - var tblEvaluate_2 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table1"]; - tblEvaluate_2.DataSource = _evaluateslist; + var tblEvaluate2 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table3"]; + tblEvaluate2.DataSource = _Evaluatelist; + var tblEvaluate3 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table4"]; + tblEvaluate3.DataSource = _Evaluatelist; + var tblEvaluate4 = (Telerik.Reporting.Table)report2.Items["detailSection1"].Items["table1"]; + tblEvaluate4.DataSource = _Evaluatelist; + var tblEvaluate5 = (Telerik.Reporting.Table)report2.Items["detailSection1"].Items["table4"]; + tblEvaluate5.DataSource = _Evaluatelist; + var tblEvaluate6 = (Telerik.Reporting.Table)report2.Items["detailSection1"].Items["table2"]; + tblEvaluate6.DataSource = _Evaluatelist; var reportBook = new ReportBook(); reportBook.Reports.Add(report); @@ -537,7 +490,7 @@ namespace BMA.EHR.Report.Service.Controllers ReportProcessor reportProcessor = new ReportProcessor(_configuration); RenderingResult result = reportProcessor.RenderReport($"{exportType}", instanceReportSource, deviceInfo); var content = result.DocumentBytes; - return File(content, mimeType, $"แบบบันทึกผล(สำหรับผู้บังคับบัญชา).{exportType.Trim().ToLower()}"); + return File(content, mimeType, $"แบบบันทึกผล.{exportType.Trim().ToLower()}"); } else { @@ -556,19 +509,178 @@ namespace BMA.EHR.Report.Service.Controllers } #endregion + #region 15-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้บังคับบัญชา (ยกเลิกใช้งาน) + ///// + ///// 15-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้บังคับบัญชา + ///// + ///// id + ///// pdf, docx หรือ xlsx + ///// + ///// เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ + ///// ไม่ได้ Login เข้าระบบ + ///// เมื่อเกิดข้อผิดพลาดในการทำงาน + //[HttpGet("15/{exportType}/{id}")] + //public async Task> GetProbation15ConvertReportAsync(Guid id, string exportType = "pdf") + //{ + // try + // { + // string authorizationHeader = Request.Headers["Authorization"]; + // string token = string.Empty; + + // if (!string.IsNullOrEmpty(authorizationHeader) && authorizationHeader.StartsWith("Bearer ")) + // { + // token = authorizationHeader.Substring("Bearer ".Length).Trim(); + // var evaluateRecord = await _repository.GetEvaluateRecordAsync(id, token); + + // if (evaluateRecord != null) + // { + // var mimeType = ""; + // switch (exportType.Trim().ToLower()) + // { + // case "pdf": mimeType = "application/pdf"; break; + // case "docx": mimeType = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"; break; + // case "xlsx": mimeType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; break; + // } + + // var rptFile = System.IO.Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"15-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้บังคับบัญชา-1.trdp"); + // var rptFile2 = System.IO.Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"15-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้บังคับบัญชา-2.trdp"); + + // ReportPackager reportPacker = new ReportPackager(); + // Telerik.Reporting.Report? report = null; + // Telerik.Reporting.Report? report2 = null; + + // using (var sourceStream = System.IO.File.OpenRead(rptFile)) + // using (var sourceStream2 = System.IO.File.OpenRead(rptFile2)) + // { + // report = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream); + // report2 = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream2); + // } + + // report.ReportParameters["Name"].Value = evaluateRecord.GetType().GetProperty("Name").GetValue(evaluateRecord); + // report.ReportParameters["Position"].Value = evaluateRecord.GetType().GetProperty("Position").GetValue(evaluateRecord); + // report.ReportParameters["ExperimenteeName"].Value = evaluateRecord.GetType().GetProperty("ExperimenteeName").GetValue(evaluateRecord); + // report.ReportParameters["ExperimenteePosition"].Value = evaluateRecord.GetType().GetProperty("ExperimenteePosition").GetValue(evaluateRecord); + // report.ReportParameters["Department"].Value = evaluateRecord.GetType().GetProperty("Department").GetValue(evaluateRecord); + // report.ReportParameters["OrganizationOrganization"].Value = evaluateRecord.GetType().GetProperty("OrganizationOrganization").GetValue(evaluateRecord); + // report.ReportParameters["Oc"].Value = evaluateRecord.GetType().GetProperty("Oc").GetValue(evaluateRecord); + // report.ReportParameters["DateStart"].Value = evaluateRecord.GetType().GetProperty("DateStart").GetValue(evaluateRecord); + // report.ReportParameters["DateFinish"].Value = evaluateRecord.GetType().GetProperty("DateFinish").GetValue(evaluateRecord); + // report.ReportParameters["AchievementStrengthDesc1"].Value = evaluateRecord.GetType().GetProperty("AchievementStrengthDesc1").GetValue(evaluateRecord); + // report.ReportParameters["AchievementStrengthDesc2"].Value = evaluateRecord.GetType().GetProperty("AchievementStrengthDesc2").GetValue(evaluateRecord); + // report.ReportParameters["AchievementStrengthDesc3"].Value = evaluateRecord.GetType().GetProperty("AchievementStrengthDesc3").GetValue(evaluateRecord); + // report.ReportParameters["AchievementImproveDesc1"].Value = evaluateRecord.GetType().GetProperty("AchievementImproveDesc1").GetValue(evaluateRecord); + // report.ReportParameters["AchievementImproveDesc2"].Value = evaluateRecord.GetType().GetProperty("AchievementImproveDesc2").GetValue(evaluateRecord); + // report.ReportParameters["AchievementImproveDesc3"].Value = evaluateRecord.GetType().GetProperty("AchievementImproveDesc3").GetValue(evaluateRecord); + // report2.ReportParameters["BehaviorStrengthDesc1"].Value = evaluateRecord.GetType().GetProperty("BehaviorStrengthDesc1").GetValue(evaluateRecord); + // report2.ReportParameters["BehaviorStrengthDesc2"].Value = evaluateRecord.GetType().GetProperty("BehaviorStrengthDesc2").GetValue(evaluateRecord); + // report2.ReportParameters["BehaviorStrengthDesc3"].Value = evaluateRecord.GetType().GetProperty("BehaviorStrengthDesc3").GetValue(evaluateRecord); + // report2.ReportParameters["BehaviorImproveDesc1"].Value = evaluateRecord.GetType().GetProperty("BehaviorImproveDesc1").GetValue(evaluateRecord); + // report2.ReportParameters["BehaviorImproveDesc2"].Value = evaluateRecord.GetType().GetProperty("BehaviorImproveDesc2").GetValue(evaluateRecord); + // report2.ReportParameters["BehaviorImproveDesc3"].Value = evaluateRecord.GetType().GetProperty("BehaviorImproveDesc3").GetValue(evaluateRecord); + // report2.ReportParameters["Name"].Value = evaluateRecord.GetType().GetProperty("Name").GetValue(evaluateRecord); + // report2.ReportParameters["Position"].Value = evaluateRecord.GetType().GetProperty("Position").GetValue(evaluateRecord); + // report2.ReportParameters["MentorDate"].Value = evaluateRecord.GetType().GetProperty("MentorDate").GetValue(evaluateRecord); + + // var _evaluateslist = new List(); + // dynamic evaluates = evaluateRecord.GetType().GetProperty("Evaluates").GetValue(evaluateRecord); + // foreach (var evaluate in evaluates) + // { + // string Evaluate_expect_desc = string.Empty; + // string Evaluate_output_desc = string.Empty; + // int Evaluate_expect_level = 0; + // int Evaluate_output_level = 0; + // string Check_expect1 = string.Empty; + // string Check_expect2 = string.Empty; + // string Check_expect3 = string.Empty; + // string Check_expect4 = string.Empty; + // string Check_expect5 = string.Empty; + // string Check_output1 = string.Empty; + // string Check_output2 = string.Empty; + // string Check_output3 = string.Empty; + // string Check_output4 = string.Empty; + // string Check_output5 = string.Empty; + // var achievements = evaluate.achievements; + // foreach (var achievement in achievements) + // { + // Evaluate_expect_desc = achievement.evaluate_expect_desc; + // Evaluate_output_desc = achievement.evaluate_output_desc; + // Evaluate_expect_level = achievement.evaluate_expect_level; + // Evaluate_output_level = achievement.evaluate_output_level; + // } + // _evaluateslist.Add(new + // { + // No = evaluate.no, + // Date_start = evaluate.date_start, + // Date_finish = evaluate.date_finish, + // Evaluate_expect_desc = $" - {Evaluate_expect_desc}", + // Evaluate_output_desc = $" - {Evaluate_output_desc}", + // Check_expect1 = Evaluate_expect_level == 1 ? "/" : string.Empty, + // Check_expect2 = Evaluate_expect_level == 2 ? "/" : string.Empty, + // Check_expect3 = Evaluate_expect_level == 3 ? "/" : string.Empty, + // Check_expect4 = Evaluate_expect_level == 4 ? "/" : string.Empty, + // Check_expect5 = Evaluate_expect_level == 5 ? "/" : string.Empty, + // Check_output1 = Evaluate_output_level == 1 ? "/" : string.Empty, + // Check_output2 = Evaluate_output_level == 2 ? "/" : string.Empty, + // Check_output3 = Evaluate_output_level == 3 ? "/" : string.Empty, + // Check_output4 = Evaluate_output_level == 4 ? "/" : string.Empty, + // Check_output5 = Evaluate_output_level == 5 ? "/" : string.Empty, + // ApplyLevel = evaluate.apply_level, + // AchievementStrengthDesc = evaluate.achievement_strength_desc, + // AchievementImproveDesc = evaluate.achievement_improve_desc, + + // }); + // } + + // var tblEvaluate_1 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table2"]; + // tblEvaluate_1.DataSource = _evaluateslist; + + // var tblEvaluate_2 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table1"]; + // tblEvaluate_2.DataSource = _evaluateslist; + + // var reportBook = new ReportBook(); + // reportBook.Reports.Add(report); + // reportBook.Reports.Add(report2); + + // System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); + // InstanceReportSource instanceReportSource = new InstanceReportSource() + // { + // ReportDocument = reportBook, + // }; + + // ReportProcessor reportProcessor = new ReportProcessor(_configuration); + // RenderingResult result = reportProcessor.RenderReport($"{exportType}", instanceReportSource, deviceInfo); + // var content = result.DocumentBytes; + // return File(content, mimeType, $"แบบบันทึกผล(สำหรับผู้บังคับบัญชา).{exportType.Trim().ToLower()}"); + // } + // else + // { + // return NotFound(); + // } + // } + // else + // { + // return Unauthorized(); + // } + // } + // catch + // { + // throw; + // } + //} + #endregion + #region 16-แบบประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้บังคับบัญชา /// /// 16-แบบประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้บังคับบัญชา /// - /// assign_id แบบมอบหมายทดลองงาน - /// evaluate_no ครั้งที่ประเมินผล + /// id /// pdf, docx หรือ xlsx /// /// เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ /// ไม่ได้ Login เข้าระบบ /// เมื่อเกิดข้อผิดพลาดในการทำงาน - [HttpGet("16/{exportType}/{id}/{no}")] - public async Task> GetProbation16ConvertReportAsync(Guid id, string no, string exportType = "pdf") + [HttpGet("16/{exportType}/{id}")] + public async Task> GetProbation16ConvertReportAsync(Guid id, string exportType = "pdf") { try { @@ -578,7 +690,7 @@ namespace BMA.EHR.Report.Service.Controllers if (!string.IsNullOrEmpty(authorizationHeader) && authorizationHeader.StartsWith("Bearer ")) { token = authorizationHeader.Substring("Bearer ".Length).Trim(); - var evaluateAssign = await _repository.GetEvaluateAssignAsync(id, no, token); + var evaluateAssign = await _repository.GetEvaluateAssignAsync(id, token); if (evaluateAssign != null) { @@ -599,10 +711,9 @@ namespace BMA.EHR.Report.Service.Controllers { report = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream); } - + report.ReportParameters["No"].Value = evaluateAssign.GetType().GetProperty("No").GetValue(evaluateAssign); report.ReportParameters["EvaluateDateStart"].Value = evaluateAssign.GetType().GetProperty("EvaluateDateStart").GetValue(evaluateAssign); report.ReportParameters["EvaluateDateFinish"].Value = evaluateAssign.GetType().GetProperty("EvaluateDateFinish").GetValue(evaluateAssign); - report.ReportParameters["No"].Value = evaluateAssign.GetType().GetProperty("No").GetValue(evaluateAssign); report.ReportParameters["Name"].Value = evaluateAssign.GetType().GetProperty("Name").GetValue(evaluateAssign); report.ReportParameters["Position"].Value = evaluateAssign.GetType().GetProperty("Position").GetValue(evaluateAssign); report.ReportParameters["Department"].Value = evaluateAssign.GetType().GetProperty("Department").GetValue(evaluateAssign); @@ -614,134 +725,143 @@ namespace BMA.EHR.Report.Service.Controllers report.ReportParameters["BehaviorImproveDesc"].Value = evaluateAssign.GetType().GetProperty("BehaviorImproveDesc").GetValue(evaluateAssign); report.ReportParameters["CommanderName"].Value = evaluateAssign.GetType().GetProperty("CommanderName").GetValue(evaluateAssign); report.ReportParameters["CommanderPosition"].Value = evaluateAssign.GetType().GetProperty("CommanderPosition").GetValue(evaluateAssign); - report.ReportParameters["AssessorDated"].Value = evaluateAssign.GetType().GetProperty("AssessorDated").GetValue(evaluateAssign); + report.ReportParameters["CommanderDated"].Value = evaluateAssign.GetType().GetProperty("CommanderDated").GetValue(evaluateAssign); - var _table1 = new List(); - _table1.Add(new + dynamic evaluate = evaluateAssign.GetType().GetProperty("Evaluate").GetValue(evaluateAssign); + dynamic knowledge = evaluate.knowledge_level; + dynamic skill = evaluate.skill_level; + dynamic competency = evaluate.competency_level; + dynamic learn = evaluate.learn_level; + dynamic apply = evaluate.apply_level; + dynamic success = evaluate.success_level; + dynamic achievement = evaluate.achievement_other_level; + dynamic conduct1 = evaluate.conduct1_level; + dynamic conduct2 = evaluate.conduct2_level; + dynamic conduct3 = evaluate.conduct3_level; + dynamic conduct4 = evaluate.conduct4_level; + dynamic moral1 = evaluate.moral1_level; + dynamic moral2 = evaluate.moral2_level; + dynamic moral3 = evaluate.moral3_level; + dynamic discipline1 = evaluate.discipline1_level; + dynamic discipline2 = evaluate.discipline2_level; + dynamic discipline3 = evaluate.discipline3_level; + dynamic discipline4 = evaluate.discipline4_level; + dynamic discipline5 = evaluate.discipline5_level; + dynamic behavior = evaluate.behavior_other_level; + var _Evaluate= new List(); + _Evaluate.Add(new { - Check_Knowledge1 = evaluateAssign.GetType().GetProperty("KnowledgeLevel1").GetValue(evaluateAssign), - Check_Knowledge2 = evaluateAssign.GetType().GetProperty("KnowledgeLevel2").GetValue(evaluateAssign), - Check_Knowledge3 = evaluateAssign.GetType().GetProperty("KnowledgeLevel3").GetValue(evaluateAssign), - Check_Knowledge4 = evaluateAssign.GetType().GetProperty("KnowledgeLevel4").GetValue(evaluateAssign), - Check_Knowledge5 = evaluateAssign.GetType().GetProperty("KnowledgeLevel5").GetValue(evaluateAssign), - Check_SkillLevel1 = evaluateAssign.GetType().GetProperty("SkillLevel1").GetValue(evaluateAssign), - Check_SkillLevel2 = evaluateAssign.GetType().GetProperty("SkillLevel2").GetValue(evaluateAssign), - Check_SkillLevel3 = evaluateAssign.GetType().GetProperty("SkillLevel3").GetValue(evaluateAssign), - Check_SkillLevel4 = evaluateAssign.GetType().GetProperty("SkillLevel4").GetValue(evaluateAssign), - Check_SkillLevel5 = evaluateAssign.GetType().GetProperty("SkillLevel5").GetValue(evaluateAssign), - Check_CompetencyLevel1 = evaluateAssign.GetType().GetProperty("CompetencyLevel1").GetValue(evaluateAssign), - Check_CompetencyLevel2 = evaluateAssign.GetType().GetProperty("CompetencyLevel2").GetValue(evaluateAssign), - Check_CompetencyLevel3 = evaluateAssign.GetType().GetProperty("CompetencyLevel3").GetValue(evaluateAssign), - Check_CompetencyLevel4 = evaluateAssign.GetType().GetProperty("CompetencyLevel4").GetValue(evaluateAssign), - Check_CompetencyLevel5 = evaluateAssign.GetType().GetProperty("CompetencyLevel5").GetValue(evaluateAssign), - Check_LearnLevel1 = evaluateAssign.GetType().GetProperty("LearnLevel1").GetValue(evaluateAssign), - Check_LearnLevel2 = evaluateAssign.GetType().GetProperty("LearnLevel2").GetValue(evaluateAssign), - Check_LearnLevel3 = evaluateAssign.GetType().GetProperty("LearnLevel3").GetValue(evaluateAssign), - Check_LearnLevel4 = evaluateAssign.GetType().GetProperty("LearnLevel4").GetValue(evaluateAssign), - Check_LearnLevel5 = evaluateAssign.GetType().GetProperty("LearnLevel5").GetValue(evaluateAssign), - Check_ApplyLevel1 = evaluateAssign.GetType().GetProperty("ApplyLevel1").GetValue(evaluateAssign), - Check_ApplyLevel2 = evaluateAssign.GetType().GetProperty("ApplyLevel2").GetValue(evaluateAssign), - Check_ApplyLevel3 = evaluateAssign.GetType().GetProperty("ApplyLevel3").GetValue(evaluateAssign), - Check_ApplyLevel4 = evaluateAssign.GetType().GetProperty("ApplyLevel4").GetValue(evaluateAssign), - Check_ApplyLevel5 = evaluateAssign.GetType().GetProperty("ApplyLevel5").GetValue(evaluateAssign), - Check_Success_level1 = evaluateAssign.GetType().GetProperty("SuccessLevel1").GetValue(evaluateAssign), - Check_Success_level2 = evaluateAssign.GetType().GetProperty("SuccessLevel2").GetValue(evaluateAssign), - Check_Success_level3 = evaluateAssign.GetType().GetProperty("SuccessLevel3").GetValue(evaluateAssign), - Check_Success_level4 = evaluateAssign.GetType().GetProperty("SuccessLevel4").GetValue(evaluateAssign), - Check_Success_level5 = evaluateAssign.GetType().GetProperty("SuccessLevel5").GetValue(evaluateAssign), AchievementOtherDesc = evaluateAssign.GetType().GetProperty("AchievementOtherDesc").GetValue(evaluateAssign), - Check_AchievementOtherLevel1 = evaluateAssign.GetType().GetProperty("AchievementOtherLevel1").GetValue(evaluateAssign), - Check_AchievementOtherLevel2 = evaluateAssign.GetType().GetProperty("AchievementOtherLevel2").GetValue(evaluateAssign), - Check_AchievementOtherLevel3 = evaluateAssign.GetType().GetProperty("AchievementOtherLevel3").GetValue(evaluateAssign), - Check_AchievementOtherLevel4 = evaluateAssign.GetType().GetProperty("AchievementOtherLevel4").GetValue(evaluateAssign), - Check_AchievementOtherLevel5 = evaluateAssign.GetType().GetProperty("AchievementOtherLevel5").GetValue(evaluateAssign), + Check_Knowledge1 = knowledge.col1, + Check_Knowledge2 = knowledge.col2, + Check_Knowledge3 = knowledge.col3, + Check_Knowledge4 = knowledge.col4, + Check_Knowledge5 = knowledge.col5, + Check_SkillLevel1 = skill.col1, + Check_SkillLevel2 = skill.col2, + Check_SkillLevel3 = skill.col3, + Check_SkillLevel4 = skill.col4, + Check_SkillLevel5 = skill.col5, + Check_CompetencyLevel1 = competency.col1, + Check_CompetencyLevel2 = competency.col2, + Check_CompetencyLevel3 = competency.col3, + Check_CompetencyLevel4 = competency.col4, + Check_CompetencyLevel5 = competency.col5, + Check_LearnLevel1 = learn.col1, + Check_LearnLevel2 = learn.col2, + Check_LearnLevel3 = learn.col3, + Check_LearnLevel4 = learn.col4, + Check_LearnLevel5 = learn.col5, + Check_ApplyLevel1 = apply.col1, + Check_ApplyLevel2 = apply.col2, + Check_ApplyLevel3 = apply.col3, + Check_ApplyLevel4 = apply.col4, + Check_ApplyLevel5 = apply.col5, + Check_Success_level1 = success.col1, + Check_Success_level2 = success.col2, + Check_Success_level3 = success.col3, + Check_Success_level4 = success.col4, + Check_Success_level5 = success.col5, + AchievementOtherDesc = evaluate.achievement_other_desc, + Check_AchievementOtherLevel1 = achievement.col1, + Check_AchievementOtherLevel2 = achievement.col2, + Check_AchievementOtherLevel3 = achievement.col3, + Check_AchievementOtherLevel4 = achievement.col4, + Check_AchievementOtherLevel5 = achievement.col5, + Check_Conduct1Level1 = conduct1.col1, + Check_Conduct1Level2 = conduct1.col2, + Check_Conduct1Level3 = conduct1.col3, + Check_Conduct1Level4 = conduct1.col4, + Check_Conduct1Level5 = conduct1.col5, + Check_Conduct2Level1 = conduct2.col1, + Check_Conduct2Level2 = conduct2.col2, + Check_Conduct2Level3 = conduct2.col3, + Check_Conduct2Level4 = conduct2.col4, + Check_Conduct2Level5 = conduct2.col5, + Check_Conduct3Level1 = conduct3.col1, + Check_Conduct3Level2 = conduct3.col2, + Check_Conduct3Level3 = conduct3.col3, + Check_Conduct3Level4 = conduct3.col4, + Check_Conduct3Level5 = conduct3.col5, + Check_Conduct4Level1 = conduct4.col1, + Check_Conduct4Level2 = conduct4.col2, + Check_Conduct4Level3 = conduct4.col3, + Check_Conduct4Level4 = conduct4.col4, + Check_Conduct4Level5 = conduct4.col5, + Check_Moral1Level1 = moral1.col1, + Check_Moral1Level2 = moral1.col2, + Check_Moral1Level3 = moral1.col3, + Check_Moral1Level4 = moral1.col4, + Check_Moral1Level5 = moral1.col5, + Check_Moral2Level1 = moral2.col1, + Check_Moral2Level2 = moral2.col2, + Check_Moral2Level3 = moral2.col3, + Check_Moral2Level4 = moral2.col4, + Check_Moral2Level5 = moral2.col4, + Check_Moral3Level1 = moral3.col1, + Check_Moral3Level2 = moral3.col2, + Check_Moral3Level3 = moral3.col3, + Check_Moral3Level4 = moral3.col4, + Check_Moral3Level5 = moral3.col5, + Check_Discipline1Level1 = discipline1.col1, + Check_Discipline1Level2 = discipline1.col2, + Check_Discipline1Level3 = discipline1.col3, + Check_Discipline1Level4 = discipline1.col4, + Check_Discipline1Level5 = discipline1.col5, + Check_Discipline2Level1 = discipline2.col1, + Check_Discipline2Level2 = discipline2.col2, + Check_Discipline2Level3 = discipline2.col3, + Check_Discipline2Level4 = discipline2.col4, + Check_Discipline2Level5 = discipline2.col5, + Check_Discipline3Level1 = discipline3.col1, + Check_Discipline3Level2 = discipline3.col2, + Check_Discipline3Level3 = discipline3.col3, + Check_Discipline3Level4 = discipline3.col4, + Check_Discipline3Level5 = discipline3.col5, + Check_Discipline4Level1 = discipline4.col1, + Check_Discipline4Level2 = discipline4.col2, + Check_Discipline4Level3 = discipline4.col3, + Check_Discipline4Level4 = discipline4.col4, + Check_Discipline4Level5 = discipline4.col5, + Check_Discipline5Level1 = discipline5.col1, + Check_Discipline5Level2 = discipline5.col2, + Check_Discipline5Level3 = discipline5.col3, + Check_Discipline5Level4 = discipline5.col4, + Check_Discipline5Level5 = discipline5.col5, + BehaviorOtherDesc = evaluate.behavior_other_desc, + Check_BehaviorOtherLevel1 = behavior.col1, + Check_BehaviorOtherLevel2 = behavior.col2, + Check_BehaviorOtherLevel3 = behavior.col3, + Check_BehaviorOtherLevel4 = behavior.col4, + Check_BehaviorOtherLevel5 = behavior.col5, }); var tblEvaluateAssign1 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table1"]; - tblEvaluateAssign1.DataSource = _table1; + tblEvaluateAssign1.DataSource = _Evaluate; - var _table2 = new List(); - _table2.Add(new - { - Check_Conduct1Level1 = evaluateAssign.GetType().GetProperty("Conduct1Level1").GetValue(evaluateAssign), - Check_Conduct1Level2 = evaluateAssign.GetType().GetProperty("Conduct1Level2").GetValue(evaluateAssign), - Check_Conduct1Level3 = evaluateAssign.GetType().GetProperty("Conduct1Level3").GetValue(evaluateAssign), - Check_Conduct1Level4 = evaluateAssign.GetType().GetProperty("Conduct1Level4").GetValue(evaluateAssign), - Check_Conduct1Level5 = evaluateAssign.GetType().GetProperty("Conduct1Level5").GetValue(evaluateAssign), - Check_Conduct2Level1 = evaluateAssign.GetType().GetProperty("Conduct2Level1").GetValue(evaluateAssign), - Check_Conduct2Level2 = evaluateAssign.GetType().GetProperty("Conduct2Level2").GetValue(evaluateAssign), - Check_Conduct2Level3 = evaluateAssign.GetType().GetProperty("Conduct2Level3").GetValue(evaluateAssign), - Check_Conduct2Level4 = evaluateAssign.GetType().GetProperty("Conduct2Level4").GetValue(evaluateAssign), - Check_Conduct2Level5 = evaluateAssign.GetType().GetProperty("Conduct2Level5").GetValue(evaluateAssign), - Check_Conduct3Level1 = evaluateAssign.GetType().GetProperty("Conduct3Level1").GetValue(evaluateAssign), - Check_Conduct3Level2 = evaluateAssign.GetType().GetProperty("Conduct3Level2").GetValue(evaluateAssign), - Check_Conduct3Level3 = evaluateAssign.GetType().GetProperty("Conduct3Level3").GetValue(evaluateAssign), - Check_Conduct3Level4 = evaluateAssign.GetType().GetProperty("Conduct3Level4").GetValue(evaluateAssign), - Check_Conduct3Level5 = evaluateAssign.GetType().GetProperty("Conduct3Level5").GetValue(evaluateAssign), - Check_Conduct4Level1 = evaluateAssign.GetType().GetProperty("Conduct4Level1").GetValue(evaluateAssign), - Check_Conduct4Level2 = evaluateAssign.GetType().GetProperty("Conduct4Level2").GetValue(evaluateAssign), - Check_Conduct4Level3 = evaluateAssign.GetType().GetProperty("Conduct4Level3").GetValue(evaluateAssign), - Check_Conduct4Level4 = evaluateAssign.GetType().GetProperty("Conduct4Level4").GetValue(evaluateAssign), - Check_Conduct4Level5 = evaluateAssign.GetType().GetProperty("Conduct4Level5").GetValue(evaluateAssign), - Check_Moral1Level1 = evaluateAssign.GetType().GetProperty("Moral1Level1").GetValue(evaluateAssign), - Check_Moral1Level2 = evaluateAssign.GetType().GetProperty("Moral1Level2").GetValue(evaluateAssign), - Check_Moral1Level3 = evaluateAssign.GetType().GetProperty("Moral1Level3").GetValue(evaluateAssign), - Check_Moral1Level4 = evaluateAssign.GetType().GetProperty("Moral1Level4").GetValue(evaluateAssign), - Check_Moral1Level5 = evaluateAssign.GetType().GetProperty("Moral1Level5").GetValue(evaluateAssign), - Check_Moral2Level1 = evaluateAssign.GetType().GetProperty("Moral2Level1").GetValue(evaluateAssign), - Check_Moral2Level2 = evaluateAssign.GetType().GetProperty("Moral2Level2").GetValue(evaluateAssign), - Check_Moral2Level3 = evaluateAssign.GetType().GetProperty("Moral2Level3").GetValue(evaluateAssign), - Check_Moral2Level4 = evaluateAssign.GetType().GetProperty("Moral2Level4").GetValue(evaluateAssign), - Check_Moral2Level5 = evaluateAssign.GetType().GetProperty("Moral2Level5").GetValue(evaluateAssign), - Check_Moral3Level1 = evaluateAssign.GetType().GetProperty("Moral3Level1").GetValue(evaluateAssign), - Check_Moral3Level2 = evaluateAssign.GetType().GetProperty("Moral3Level2").GetValue(evaluateAssign), - Check_Moral3Level3 = evaluateAssign.GetType().GetProperty("Moral3Level3").GetValue(evaluateAssign), - Check_Moral3Level4 = evaluateAssign.GetType().GetProperty("Moral3Level4").GetValue(evaluateAssign), - Check_Moral3Level5 = evaluateAssign.GetType().GetProperty("Moral3Level5").GetValue(evaluateAssign), - Check_Discipline1Level1 = evaluateAssign.GetType().GetProperty("Discipline1Level1").GetValue(evaluateAssign), - Check_Discipline1Level2 = evaluateAssign.GetType().GetProperty("Discipline1Level2").GetValue(evaluateAssign), - Check_Discipline1Level3 = evaluateAssign.GetType().GetProperty("Discipline1Level3").GetValue(evaluateAssign), - Check_Discipline1Level4 = evaluateAssign.GetType().GetProperty("Discipline1Level4").GetValue(evaluateAssign), - Check_Discipline1Level5 = evaluateAssign.GetType().GetProperty("Discipline1Level5").GetValue(evaluateAssign), - Check_Discipline2Level1 = evaluateAssign.GetType().GetProperty("Discipline2Level1").GetValue(evaluateAssign), - Check_Discipline2Level2 = evaluateAssign.GetType().GetProperty("Discipline2Level2").GetValue(evaluateAssign), - Check_Discipline2Level3 = evaluateAssign.GetType().GetProperty("Discipline2Level3").GetValue(evaluateAssign), - Check_Discipline2Level4 = evaluateAssign.GetType().GetProperty("Discipline2Level4").GetValue(evaluateAssign), - Check_Discipline2Level5 = evaluateAssign.GetType().GetProperty("Discipline2Level5").GetValue(evaluateAssign), - Check_Discipline3Level1 = evaluateAssign.GetType().GetProperty("Discipline3Level1").GetValue(evaluateAssign), - Check_Discipline3Level2 = evaluateAssign.GetType().GetProperty("Discipline3Level2").GetValue(evaluateAssign), - Check_Discipline3Level3 = evaluateAssign.GetType().GetProperty("Discipline3Level3").GetValue(evaluateAssign), - Check_Discipline3Level4 = evaluateAssign.GetType().GetProperty("Discipline3Level4").GetValue(evaluateAssign), - Check_Discipline3Level5 = evaluateAssign.GetType().GetProperty("Discipline3Level5").GetValue(evaluateAssign), - Check_Discipline4Level1 = evaluateAssign.GetType().GetProperty("Discipline4Level1").GetValue(evaluateAssign), - Check_Discipline4Level2 = evaluateAssign.GetType().GetProperty("Discipline4Level2").GetValue(evaluateAssign), - Check_Discipline4Level3 = evaluateAssign.GetType().GetProperty("Discipline4Level3").GetValue(evaluateAssign), - Check_Discipline4Level4 = evaluateAssign.GetType().GetProperty("Discipline4Level4").GetValue(evaluateAssign), - Check_Discipline4Level5 = evaluateAssign.GetType().GetProperty("Discipline4Level5").GetValue(evaluateAssign), - Check_Discipline5Level1 = evaluateAssign.GetType().GetProperty("Discipline5Level1").GetValue(evaluateAssign), - Check_Discipline5Level2 = evaluateAssign.GetType().GetProperty("Discipline5Level2").GetValue(evaluateAssign), - Check_Discipline5Level3 = evaluateAssign.GetType().GetProperty("Discipline5Level3").GetValue(evaluateAssign), - Check_Discipline5Level4 = evaluateAssign.GetType().GetProperty("Discipline5Level4").GetValue(evaluateAssign), - Check_Discipline5Level5 = evaluateAssign.GetType().GetProperty("Discipline5Level5").GetValue(evaluateAssign), - BehaviorOtherDesc = evaluateAssign.GetType().GetProperty("BehaviorOtherDesc").GetValue(evaluateAssign), - Check_BehaviorOtherLevel1 = evaluateAssign.GetType().GetProperty("BehaviorOtherLevel1").GetValue(evaluateAssign), - Check_BehaviorOtherLevel2 = evaluateAssign.GetType().GetProperty("BehaviorOtherLevel2").GetValue(evaluateAssign), - Check_BehaviorOtherLevel3 = evaluateAssign.GetType().GetProperty("BehaviorOtherLevel3").GetValue(evaluateAssign), - Check_BehaviorOtherLevel4 = evaluateAssign.GetType().GetProperty("BehaviorOtherLevel4").GetValue(evaluateAssign), - Check_BehaviorOtherLevel5 = evaluateAssign.GetType().GetProperty("BehaviorOtherLevel5").GetValue(evaluateAssign), - }); var tblEvaluateAssign2 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table2"]; - tblEvaluateAssign2.DataSource = _table2; + tblEvaluateAssign2.DataSource = _Evaluate; - - var _table3 = new List(); - _table3.Add(new - { - Orientation = evaluateAssign.GetType().GetProperty("Orientation").GetValue(evaluateAssign), - SelfLearning = evaluateAssign.GetType().GetProperty("SelfLearning").GetValue(evaluateAssign), - TrainingSeminar = evaluateAssign.GetType().GetProperty("TrainingSeminar").GetValue(evaluateAssign), - OtherTraining = evaluateAssign.GetType().GetProperty("OtherTraining").GetValue(evaluateAssign), - }); var tblEvaluateAssign3 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table3"]; - tblEvaluateAssign3.DataSource = _table3; + tblEvaluateAssign3.DataSource = evaluate; System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); InstanceReportSource instanceReportSource = new InstanceReportSource() @@ -775,15 +895,14 @@ namespace BMA.EHR.Report.Service.Controllers /// /// 17-แบบประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับคณะกรรมการ /// - /// assign_id แบบมอบหมายทดลองงาน - /// evaluate_no ครั้งที่ประเมินผล + /// id /// pdf, docx หรือ xlsx /// /// เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ /// ไม่ได้ Login เข้าระบบ /// เมื่อเกิดข้อผิดพลาดในการทำงาน - [HttpGet("17/{exportType}/{id}/{no}")] - public async Task> GetProbation17ConvertReportAsync(Guid id, string no, string exportType = "pdf") + [HttpGet("17/{exportType}/{id}")] + public async Task> GetProbation17ConvertReportAsync(Guid id, string exportType = "pdf") { try { @@ -793,7 +912,7 @@ namespace BMA.EHR.Report.Service.Controllers if (!string.IsNullOrEmpty(authorizationHeader) && authorizationHeader.StartsWith("Bearer ")) { token = authorizationHeader.Substring("Bearer ".Length).Trim(); - var evaluateAssign = await _repository.GetEvaluateChairmanAssignAsync(id, no, token); + var evaluateAssign = await _repository.GetEvaluateChairmanAssignAsync(id, token); if (evaluateAssign != null) { @@ -819,10 +938,9 @@ namespace BMA.EHR.Report.Service.Controllers report = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream); report2 = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream2); } - + report.ReportParameters["No"].Value = evaluateAssign.GetType().GetProperty("No").GetValue(evaluateAssign); report.ReportParameters["EvaluateDateStart"].Value = evaluateAssign.GetType().GetProperty("EvaluateDateStart").GetValue(evaluateAssign); report.ReportParameters["EvaluateDateFinish"].Value = evaluateAssign.GetType().GetProperty("EvaluateDateFinish").GetValue(evaluateAssign); - report.ReportParameters["No"].Value = evaluateAssign.GetType().GetProperty("No").GetValue(evaluateAssign); report.ReportParameters["Name"].Value = evaluateAssign.GetType().GetProperty("Name").GetValue(evaluateAssign); report.ReportParameters["Position"].Value = evaluateAssign.GetType().GetProperty("Position").GetValue(evaluateAssign); report.ReportParameters["Department"].Value = evaluateAssign.GetType().GetProperty("Department").GetValue(evaluateAssign); @@ -832,77 +950,154 @@ namespace BMA.EHR.Report.Service.Controllers report.ReportParameters["DateFinish"].Value = evaluateAssign.GetType().GetProperty("DateFinish").GetValue(evaluateAssign); report2.ReportParameters["ChairmanName"].Value = evaluateAssign.GetType().GetProperty("ChairmanName").GetValue(evaluateAssign); report2.ReportParameters["ChairmanPosition"].Value = evaluateAssign.GetType().GetProperty("ChairmanPosition").GetValue(evaluateAssign); - report2.ReportParameters["ChairmanDate"].Value = evaluateAssign.GetType().GetProperty("ChairmanDate").GetValue(evaluateAssign); - report2.ReportParameters["MentorName1"].Value = evaluateAssign.GetType().GetProperty("MentorName1").GetValue(evaluateAssign); - report2.ReportParameters["MentorPosition1"].Value = evaluateAssign.GetType().GetProperty("MentorPosition1").GetValue(evaluateAssign); - report2.ReportParameters["MentorDate1"].Value = evaluateAssign.GetType().GetProperty("MentorDate1").GetValue(evaluateAssign); - report2.ReportParameters["MentorName2"].Value = evaluateAssign.GetType().GetProperty("MentorName2").GetValue(evaluateAssign); - report2.ReportParameters["MentorPosition2"].Value = evaluateAssign.GetType().GetProperty("MentorPosition2").GetValue(evaluateAssign); - report2.ReportParameters["MentorDate2"].Value = evaluateAssign.GetType().GetProperty("MentorDate2").GetValue(evaluateAssign); + report2.ReportParameters["MentorName1"].Value = evaluateAssign.GetType().GetProperty("Director1Name").GetValue(evaluateAssign); + report2.ReportParameters["MentorPosition1"].Value = evaluateAssign.GetType().GetProperty("Director1Position").GetValue(evaluateAssign); + report2.ReportParameters["MentorName2"].Value = evaluateAssign.GetType().GetProperty("Director2Name").GetValue(evaluateAssign); + report2.ReportParameters["MentorPosition2"].Value = evaluateAssign.GetType().GetProperty("Director2Position").GetValue(evaluateAssign); + report2.ReportParameters["ChairmanDated"].Value = evaluateAssign.GetType().GetProperty("ChairmanDated").GetValue(evaluateAssign); + report2.ReportParameters["Director1Dated"].Value = evaluateAssign.GetType().GetProperty("Director1Dated").GetValue(evaluateAssign); + report2.ReportParameters["Director2Dated"].Value = evaluateAssign.GetType().GetProperty("Director2Dated").GetValue(evaluateAssign); - var _page1table1 = new List(); - _page1table1.Add(new + dynamic evaluate = evaluateAssign.GetType().GetProperty("Evaluate").GetValue(evaluateAssign); + dynamic knowledge = evaluate.knowledge_level; + dynamic apply = evaluate.apply_level; + dynamic success = evaluate.success_level; + dynamic achievement = evaluate.achievement_other_level; + dynamic conduct1 = evaluate.conduct1_level; + dynamic conduct2 = evaluate.conduct2_level; + dynamic conduct3 = evaluate.conduct3_level; + dynamic conduct4 = evaluate.conduct4_level; + dynamic moral1 = evaluate.moral1_level; + dynamic moral2 = evaluate.moral2_level; + dynamic moral3 = evaluate.moral3_level; + dynamic discipline1 = evaluate.discipline1_level; + dynamic discipline2 = evaluate.discipline2_level; + dynamic discipline3 = evaluate.discipline3_level; + dynamic discipline4 = evaluate.discipline4_level; + dynamic discipline5 = evaluate.discipline5_level; + dynamic behavior = evaluate.behavior_other_level; + string behavior_other_desc = evaluate.behavior_other_desc; + var _Evaluate = new List(); + _Evaluate.Add(new { - KnowledgeLevel = evaluateAssign.GetType().GetProperty("KnowledgeLevel").GetValue(evaluateAssign), - ApplyLevel = evaluateAssign.GetType().GetProperty("ApplyLevel").GetValue(evaluateAssign), - SuccessLevel = evaluateAssign.GetType().GetProperty("SuccessLevel").GetValue(evaluateAssign), - AchievementOtherDesc = evaluateAssign.GetType().GetProperty("AchievementOtherDesc").GetValue(evaluateAssign), - AchievementOtherLevel = evaluateAssign.GetType().GetProperty("AchievementOtherLevel").GetValue(evaluateAssign), - }); - var tblEvaluatChaireAssign1 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table2"]; //Design is table2 - tblEvaluatChaireAssign1.DataSource = _page1table1; - - var _page1table2 = new List(); - _page1table2.Add(new - { - Conduct1Level = evaluateAssign.GetType().GetProperty("Conduct1Level").GetValue(evaluateAssign), - Conduct2Level = evaluateAssign.GetType().GetProperty("Conduct2Level").GetValue(evaluateAssign), - Conduct3Level = evaluateAssign.GetType().GetProperty("Conduct3Level").GetValue(evaluateAssign), - Conduct4Level = evaluateAssign.GetType().GetProperty("Conduct4Level").GetValue(evaluateAssign), - Moral1Level = evaluateAssign.GetType().GetProperty("Moral1Level").GetValue(evaluateAssign), - Moral2Level = evaluateAssign.GetType().GetProperty("Moral2Level").GetValue(evaluateAssign), - Moral3Level = evaluateAssign.GetType().GetProperty("Moral3Level").GetValue(evaluateAssign), - Discipline1Level = evaluateAssign.GetType().GetProperty("Discipline1Level").GetValue(evaluateAssign), - Discipline2Level = evaluateAssign.GetType().GetProperty("Discipline2Level").GetValue(evaluateAssign), - Discipline3Level = evaluateAssign.GetType().GetProperty("Discipline3Level").GetValue(evaluateAssign), - Discipline4Level = evaluateAssign.GetType().GetProperty("Discipline4Level").GetValue(evaluateAssign), - Discipline5Level = evaluateAssign.GetType().GetProperty("Discipline5Level").GetValue(evaluateAssign), - BehaviorOtherDesc = evaluateAssign.GetType().GetProperty("BehaviorOtherDesc").GetValue(evaluateAssign), - BehaviorOtherLevel = evaluateAssign.GetType().GetProperty("BehaviorOtherLevel").GetValue(evaluateAssign), - }); - var tblEvaluatChaireAssign2 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table1"]; //Design is table1 - tblEvaluatChaireAssign2.DataSource = _page1table2; - - var _page2table1 = new List(); - _page2table1.Add(new - { - AchievementScore = evaluateAssign.GetType().GetProperty("AchievementScore").GetValue(evaluateAssign), - AchievementPercent = evaluateAssign.GetType().GetProperty("AchievementPercent").GetValue(evaluateAssign), - AchievementResult = evaluateAssign.GetType().GetProperty("AchievementResult").GetValue(evaluateAssign), - BehaviorScore = evaluateAssign.GetType().GetProperty("BehaviorScore").GetValue(evaluateAssign), - BehaviorPercent = evaluateAssign.GetType().GetProperty("BehaviorPercent").GetValue(evaluateAssign), - BehaviorResult = evaluateAssign.GetType().GetProperty("BehaviorResult").GetValue(evaluateAssign), - AchievementScoretotal = evaluateAssign.GetType().GetProperty("AchievementScoretotal").GetValue(evaluateAssign), - BehaviorScoretotal = evaluateAssign.GetType().GetProperty("BehaviorScoretotal").GetValue(evaluateAssign), - }); - var tblEvaluateChairAssign3 = (Telerik.Reporting.Table)report2.Items["detailSection1"].Items["table2"]; - tblEvaluateChairAssign3.DataSource = _page2table1; - - var _page2table2 = new List(); - _page2table2.Add(new - { - DevelopOrientationScore = evaluateAssign.GetType().GetProperty("DevelopOrientationScore").GetValue(evaluateAssign), - DevelopSelfLearningScore = evaluateAssign.GetType().GetProperty("DevelopSelfLearningScore").GetValue(evaluateAssign), - DevelopTrainingSeminarScore = evaluateAssign.GetType().GetProperty("DevelopTrainingSeminarScore").GetValue(evaluateAssign), - DevelopOtherTrainingScore = evaluateAssign.GetType().GetProperty("DevelopOtherTrainingScore").GetValue(evaluateAssign), - DevelopOrientationPercent = evaluateAssign.GetType().GetProperty("DevelopOrientationPercent").GetValue(evaluateAssign), - DevelopSelfLearningPercent = evaluateAssign.GetType().GetProperty("DevelopSelfLearningPercent").GetValue(evaluateAssign), - DevelopTrainingSeminarPercent = evaluateAssign.GetType().GetProperty("DevelopTrainingSeminarPercent").GetValue(evaluateAssign), - DevelopOtherTrainingPercent = evaluateAssign.GetType().GetProperty("DevelopOtherTrainingPercent").GetValue(evaluateAssign), + Check_Knowledge1 = knowledge.col1, + Check_Knowledge2 = knowledge.col2, + Check_Knowledge3 = knowledge.col3, + Check_Knowledge4 = knowledge.col4, + Check_Knowledge5 = knowledge.col5, + Check_ApplyLevel1 = apply.col1, + Check_ApplyLevel2 = apply.col2, + Check_ApplyLevel3 = apply.col3, + Check_ApplyLevel4 = apply.col4, + Check_ApplyLevel5 = apply.col5, + Check_Success_level1 = success.col1, + Check_Success_level2 = success.col2, + Check_Success_level3 = success.col3, + Check_Success_level4 = success.col4, + Check_Success_level5 = success.col5, + AchievementOtherDesc = evaluate.achievement_other_desc, + Check_AchievementOtherLevel1 = achievement.col1, + Check_AchievementOtherLevel2 = achievement.col2, + Check_AchievementOtherLevel3 = achievement.col3, + Check_AchievementOtherLevel4 = achievement.col4, + Check_AchievementOtherLevel5 = achievement.col5, + Check_Conduct1Level1 = conduct1.col1, + Check_Conduct1Level2 = conduct1.col2, + Check_Conduct1Level3 = conduct1.col3, + Check_Conduct1Level4 = conduct1.col4, + Check_Conduct1Level5 = conduct1.col5, + Check_Conduct2Level1 = conduct2.col1, + Check_Conduct2Level2 = conduct2.col2, + Check_Conduct2Level3 = conduct2.col3, + Check_Conduct2Level4 = conduct2.col4, + Check_Conduct2Level5 = conduct2.col5, + Check_Conduct3Level1 = conduct3.col1, + Check_Conduct3Level2 = conduct3.col2, + Check_Conduct3Level3 = conduct3.col3, + Check_Conduct3Level4 = conduct3.col4, + Check_Conduct3Level5 = conduct3.col5, + Check_Conduct4Level1 = conduct4.col1, + Check_Conduct4Level2 = conduct4.col2, + Check_Conduct4Level3 = conduct4.col3, + Check_Conduct4Level4 = conduct4.col4, + Check_Conduct4Level5 = conduct4.col5, + Check_Moral1Level1 = moral1.col1, + Check_Moral1Level2 = moral1.col2, + Check_Moral1Level3 = moral1.col3, + Check_Moral1Level4 = moral1.col4, + Check_Moral1Level5 = moral1.col5, + Check_Moral2Level1 = moral2.col1, + Check_Moral2Level2 = moral2.col2, + Check_Moral2Level3 = moral2.col3, + Check_Moral2Level4 = moral2.col4, + Check_Moral2Level5 = moral2.col4, + Check_Moral3Level1 = moral3.col1, + Check_Moral3Level2 = moral3.col2, + Check_Moral3Level3 = moral3.col3, + Check_Moral3Level4 = moral3.col4, + Check_Moral3Level5 = moral3.col5, + Check_Discipline1Level1 = discipline1.col1, + Check_Discipline1Level2 = discipline1.col2, + Check_Discipline1Level3 = discipline1.col3, + Check_Discipline1Level4 = discipline1.col4, + Check_Discipline1Level5 = discipline1.col5, + Check_Discipline2Level1 = discipline2.col1, + Check_Discipline2Level2 = discipline2.col2, + Check_Discipline2Level3 = discipline2.col3, + Check_Discipline2Level4 = discipline2.col4, + Check_Discipline2Level5 = discipline2.col5, + Check_Discipline3Level1 = discipline3.col1, + Check_Discipline3Level2 = discipline3.col2, + Check_Discipline3Level3 = discipline3.col3, + Check_Discipline3Level4 = discipline3.col4, + Check_Discipline3Level5 = discipline3.col5, + Check_Discipline4Level1 = discipline4.col1, + Check_Discipline4Level2 = discipline4.col2, + Check_Discipline4Level3 = discipline4.col3, + Check_Discipline4Level4 = discipline4.col4, + Check_Discipline4Level5 = discipline4.col5, + Check_Discipline5Level1 = discipline5.col1, + Check_Discipline5Level2 = discipline5.col2, + Check_Discipline5Level3 = discipline5.col3, + Check_Discipline5Level4 = discipline5.col4, + Check_Discipline5Level5 = discipline5.col5, + BehaviorOtherDesc = evaluate.behavior_other_desc, + Check_BehaviorOtherLevel1 = behavior.col1, + Check_BehaviorOtherLevel2 = behavior.col2, + Check_BehaviorOtherLevel3 = behavior.col3, + Check_BehaviorOtherLevel4 = behavior.col4, + Check_BehaviorOtherLevel5 = behavior.col5, + achievement_score = evaluate.achievement_score, + achievement_score_total = evaluate.achievement_score_total, + achievement_percent = evaluate.achievement_percent, + achievement_result = evaluate.achievement_result, + behavior_score = evaluate.behavior_score, + behavior_score_total = evaluate.behavior_score_total, + behavior_percent = evaluate.behavior_percent, + behavior_result = evaluate.behavior_result, + sum_score = evaluate.sum_score, + sum_percent = evaluate.sum_percent, + develop_orientation_score = evaluate.develop_orientation_score, + develop_self_learning_score = evaluate.develop_self_learning_score, + develop_training_seminar_score = evaluate.develop_training_seminar_score, + develop_other_training_score = evaluate.develop_other_training_score, + develop_total_score = evaluate.develop_total_score, + develop_orientation_percent = evaluate.develop_orientation_percent, + develop_self_learning_percent = evaluate.develop_self_learning_percent, + develop_training_seminar_percent = evaluate.develop_training_seminar_percent, + develop_other_training_percent = evaluate.develop_other_training_percent, + develop_total_percent = evaluate.develop_total_percent, + develop_result = evaluate.develop_result, }); - var tblEvaluateChairAssign4 = (Telerik.Reporting.Table)report2.Items["detailSection1"].Items["table3"]; - tblEvaluateChairAssign4.DataSource = _page2table2; + var tblEvaluateAssign1 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table2"]; + tblEvaluateAssign1.DataSource = _Evaluate; + var tblEvaluateAssign2 = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table1"]; + tblEvaluateAssign2.DataSource = _Evaluate; + var tblEvaluateAssign3 = (Telerik.Reporting.Table)report2.Items["detailSection1"].Items["table2"]; + tblEvaluateAssign3.DataSource = _Evaluate; + var tblEvaluateAssign4 = (Telerik.Reporting.Table)report2.Items["detailSection1"].Items["table3"]; + tblEvaluateAssign4.DataSource = _Evaluate; var reportBook = new ReportBook(); reportBook.Reports.Add(report); @@ -936,92 +1131,93 @@ namespace BMA.EHR.Report.Service.Controllers } #endregion - #region 18-แบบรายงานการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับประธาน - /// - /// 18-แบบรายงานการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับประธาน - /// - /// id - /// pdf, docx หรือ xlsx - /// - /// เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ - /// ไม่ได้ Login เข้าระบบ - /// เมื่อเกิดข้อผิดพลาดในการทำงาน - [HttpGet("18/{exportType}/{id}")] - public async Task> GetProbation18ConvertReportAsync(Guid id, string exportType = "pdf") - { - try - { - string authorizationHeader = Request.Headers["Authorization"]; - string token = string.Empty; + #region 18-แบบรายงานการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับประธาน (ยกเลิกใช้งาน) + ///// + ///// 18-แบบรายงานการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับประธาน + ///// + ///// assign_id + ///// pdf, docx หรือ xlsx + ///// + ///// เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ + ///// ไม่ได้ Login เข้าระบบ + ///// เมื่อเกิดข้อผิดพลาดในการทำงาน + //[HttpGet("18/{exportType}/{id}")] + //public async Task> GetProbation18ConvertReportAsync(string id="9e8ec043-9f18-4f9a-bcde-3d11c909df19", string exportType = "pdf") + //{ + // try + // { + // Guid Id = Guid.Parse(id); + // string authorizationHeader = Request.Headers["Authorization"]; + // string token = string.Empty; - if (!string.IsNullOrEmpty(authorizationHeader) && authorizationHeader.StartsWith("Bearer ")) - { - token = authorizationHeader.Substring("Bearer ".Length).Trim(); - var evaluateAssign = await _repository.GetEvaluateResultAssignAsync(id, token); + // if (!string.IsNullOrEmpty(authorizationHeader) && authorizationHeader.StartsWith("Bearer ")) + // { + // token = authorizationHeader.Substring("Bearer ".Length).Trim(); + // var evaluateAssign = await _repository.GetEvaluateResultAssignAsync(Id, token); - if (evaluateAssign != null) - { - var mimeType = ""; - switch (exportType.Trim().ToLower()) - { - case "pdf": mimeType = "application/pdf"; break; - case "docx": mimeType = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"; break; - case "xlsx": mimeType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; break; - } + // if (evaluateAssign != null) + // { + // var mimeType = ""; + // switch (exportType.Trim().ToLower()) + // { + // case "pdf": mimeType = "application/pdf"; break; + // case "docx": mimeType = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"; break; + // case "xlsx": mimeType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; break; + // } - var rptFile = System.IO.Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"18-แบบรายงานการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับประธาน-1.trdp"); + // var rptFile = System.IO.Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"18-แบบรายงานการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับประธาน-1.trdp"); - ReportPackager reportPacker = new ReportPackager(); - Telerik.Reporting.Report? report = null; - //Telerik.Reporting.Report? report2 = null; + // ReportPackager reportPacker = new ReportPackager(); + // Telerik.Reporting.Report? report = null; + // //Telerik.Reporting.Report? report2 = null; - using (var sourceStream = System.IO.File.OpenRead(rptFile)) - //using (var sourceStream2 = System.IO.File.OpenRead(rptFile2)) - { - report = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream); - //report2 = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream2); - } + // using (var sourceStream = System.IO.File.OpenRead(rptFile)) + // //using (var sourceStream2 = System.IO.File.OpenRead(rptFile2)) + // { + // report = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream); + // //report2 = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream2); + // } - report.ReportParameters["Name"].Value = evaluateAssign.GetType().GetProperty("Name").GetValue(evaluateAssign); + // report.ReportParameters["Name"].Value = evaluateAssign.GetType().GetProperty("Name").GetValue(evaluateAssign); - var reportBook = new ReportBook(); - reportBook.Reports.Add(report); - //reportBook.Reports.Add(report2); + // var reportBook = new ReportBook(); + // reportBook.Reports.Add(report); + // //reportBook.Reports.Add(report2); - System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); - InstanceReportSource instanceReportSource = new InstanceReportSource() - { - ReportDocument = reportBook, - }; + // System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); + // InstanceReportSource instanceReportSource = new InstanceReportSource() + // { + // ReportDocument = reportBook, + // }; - ReportProcessor reportProcessor = new ReportProcessor(_configuration); - RenderingResult result = reportProcessor.RenderReport($"{exportType}", instanceReportSource, deviceInfo); - var content = result.DocumentBytes; - return File(content, mimeType, $"แบบรายงานการประเมินผล(สำหรับประธาน).{exportType.Trim().ToLower()}"); - } - else - { - return NotFound(); - } - } - else - { - return Unauthorized(); - } - } - catch - { - throw; - } - } + // ReportProcessor reportProcessor = new ReportProcessor(_configuration); + // RenderingResult result = reportProcessor.RenderReport($"{exportType}", instanceReportSource, deviceInfo); + // var content = result.DocumentBytes; + // return File(content, mimeType, $"แบบรายงานการประเมินผล(สำหรับประธาน).{exportType.Trim().ToLower()}"); + // } + // else + // { + // return NotFound(); + // } + // } + // else + // { + // return Unauthorized(); + // } + // } + // catch + // { + // throw; + // } + //} #endregion - #region 19-แบบรายงานการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ กรณีขยายเวลา + #region 19-แบบรายงานการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับประธาน และ กรณีขยายเวลา /// - /// 19-แบบรายงานการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ กรณีขยายเวลา + /// 19-แบบรายงานการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับประธาน และ กรณีขยายเวลา /// - /// id + /// assign id แบบมอบหมายงานการทดลองปฏิบัติหน้าที่ราชการ /// pdf, docx หรือ xlsx /// /// เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ @@ -1058,8 +1254,8 @@ namespace BMA.EHR.Report.Service.Controllers report = (Telerik.Reporting.Report)reportPacker.UnpackageDocument(sourceStream); } - report.ReportParameters["DateStart"].Value = evaluateAssign.GetType().GetProperty("DateStart").GetValue(evaluateAssign); - report.ReportParameters["DateFinish"].Value = evaluateAssign.GetType().GetProperty("DateFinish").GetValue(evaluateAssign); + report.ReportParameters["EvaluateDateStart"].Value = evaluateAssign.GetType().GetProperty("EvaluateDateStart").GetValue(evaluateAssign); + report.ReportParameters["EvaluateDateFinish"].Value = evaluateAssign.GetType().GetProperty("EvaluateDateFinish").GetValue(evaluateAssign); report.ReportParameters["Reson"].Value = evaluateAssign.GetType().GetProperty("Reson").GetValue(evaluateAssign); report.ReportParameters["DevelopComplete"].Value = evaluateAssign.GetType().GetProperty("DevelopComplete").GetValue(evaluateAssign); report.ReportParameters["NotDevelopComplete"].Value = evaluateAssign.GetType().GetProperty("NotDevelopComplete").GetValue(evaluateAssign); @@ -1077,7 +1273,7 @@ namespace BMA.EHR.Report.Service.Controllers }; ReportProcessor reportProcessor = new ReportProcessor(_configuration); RenderingResult result = reportProcessor.RenderReport($"{exportType}", instanceReportSource, deviceInfo); - return File(result.DocumentBytes, mimeType, $"แบบรายงานการประเมินผล(กรณีขยายเวลา).{exportType.Trim().ToLower()}"); + return File(result.DocumentBytes, mimeType, $"แบบรายงานการประเมินผล.{exportType.Trim().ToLower()}"); } else { diff --git a/BMA.EHR.Report.Service/Reports/14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล-1.trdp b/BMA.EHR.Report.Service/Reports/14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล-1.trdp index 23d7b6dc..4358c2d0 100644 Binary files a/BMA.EHR.Report.Service/Reports/14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล-1.trdp and b/BMA.EHR.Report.Service/Reports/14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล-1.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล-2.trdp b/BMA.EHR.Report.Service/Reports/14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล-2.trdp index 6fe99ba6..56533578 100644 Binary files a/BMA.EHR.Report.Service/Reports/14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล-2.trdp and b/BMA.EHR.Report.Service/Reports/14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล-2.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล-3.trdp b/BMA.EHR.Report.Service/Reports/14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล-3.trdp deleted file mode 100644 index 288fbb22..00000000 Binary files a/BMA.EHR.Report.Service/Reports/14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล-3.trdp and /dev/null differ diff --git a/BMA.EHR.Report.Service/Reports/14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล-4.trdp b/BMA.EHR.Report.Service/Reports/14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล-4.trdp deleted file mode 100644 index 06da9fb9..00000000 Binary files a/BMA.EHR.Report.Service/Reports/14-แบบบันทึกผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้ดูแล-4.trdp and /dev/null differ diff --git a/BMA.EHR.Report.Service/Reports/16-แบบประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้บังคับบัญชา-1.trdp b/BMA.EHR.Report.Service/Reports/16-แบบประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้บังคับบัญชา-1.trdp index e1341df6..36680956 100644 Binary files a/BMA.EHR.Report.Service/Reports/16-แบบประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้บังคับบัญชา-1.trdp and b/BMA.EHR.Report.Service/Reports/16-แบบประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้บังคับบัญชา-1.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/16-แบบประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้บังคับบัญชา-2.trdp b/BMA.EHR.Report.Service/Reports/16-แบบประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้บังคับบัญชา-2.trdp deleted file mode 100644 index 8b0a1a19..00000000 Binary files a/BMA.EHR.Report.Service/Reports/16-แบบประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับผู้บังคับบัญชา-2.trdp and /dev/null differ diff --git a/BMA.EHR.Report.Service/Reports/17-แบบประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับคณะกรรมการ-1.trdp b/BMA.EHR.Report.Service/Reports/17-แบบประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับคณะกรรมการ-1.trdp index 671c67c6..f12a4e52 100644 Binary files a/BMA.EHR.Report.Service/Reports/17-แบบประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับคณะกรรมการ-1.trdp and b/BMA.EHR.Report.Service/Reports/17-แบบประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับคณะกรรมการ-1.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/17-แบบประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับคณะกรรมการ-2.trdp b/BMA.EHR.Report.Service/Reports/17-แบบประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับคณะกรรมการ-2.trdp index 51a28d46..4a3ce0da 100644 Binary files a/BMA.EHR.Report.Service/Reports/17-แบบประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับคณะกรรมการ-2.trdp and b/BMA.EHR.Report.Service/Reports/17-แบบประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับคณะกรรมการ-2.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/17-แบบประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับคณะกรรมการ-3.trdp b/BMA.EHR.Report.Service/Reports/17-แบบประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับคณะกรรมการ-3.trdp deleted file mode 100644 index 2bdbfe6f..00000000 Binary files a/BMA.EHR.Report.Service/Reports/17-แบบประเมินผลการทดลองปฏิบัติหน้าที่ราชการ สำหรับคณะกรรมการ-3.trdp and /dev/null differ diff --git a/BMA.EHR.Report.Service/Reports/19-แบบรายงานการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ กรณีขยายเวลา.trdp b/BMA.EHR.Report.Service/Reports/19-แบบรายงานการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ กรณีขยายเวลา.trdp index 776117f9..90c50028 100644 Binary files a/BMA.EHR.Report.Service/Reports/19-แบบรายงานการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ กรณีขยายเวลา.trdp and b/BMA.EHR.Report.Service/Reports/19-แบบรายงานการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ กรณีขยายเวลา.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/13-แบบมอบหมายงานการทดลองปฏิบัติหน้าที่ราชการ.trdp b/BMA.EHR.Report.Service/Reports/Old/13-แบบมอบหมายงานการทดลองปฏิบัติหน้าที่ราชการ.trdp similarity index 100% rename from BMA.EHR.Report.Service/Reports/13-แบบมอบหมายงานการทดลองปฏิบัติหน้าที่ราชการ.trdp rename to BMA.EHR.Report.Service/Reports/Old/13-แบบมอบหมายงานการทดลองปฏิบัติหน้าที่ราชการ.trdp