From 548425445128013fe296231603af59049ccda732 Mon Sep 17 00:00:00 2001 From: "Harid Promsri (Bright)" Date: Tue, 12 Sep 2023 18:01:21 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?= =?UTF-8?q?=20api=20=E0=B9=81=E0=B8=9A=E0=B8=9A=E0=B8=A3=E0=B8=B2=E0=B8=A2?= =?UTF-8?q?=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9B?= =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B9=80=E0=B8=A1=E0=B8=B4=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reports/ProbationReportRepository.cs | 6 ++---- .../Controllers/ProbationReportController.cs | 2 -- ...Ēāļ‡āļēāļ™āļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļāļĢāļ“āļĩāļ‚āļĒāļēāļĒāđ€āļ§āļĨāļē.trdp | Bin 2076 -> 2138 bytes 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs index fda75849..6a7423f1 100644 --- a/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs @@ -259,10 +259,8 @@ namespace BMA.EHR.Application.Repositories.Reports 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, 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" ? "/" : " ", + DevelopComplete = string.IsNullOrEmpty(evaluate_assign.data.evaluate.develop_complete.ToString()) ? 0 : evaluate_assign.data.evaluate.develop_complete, + PassResult = string.IsNullOrEmpty(evaluate_assign.data.evaluate.pass_result.ToString()) ? 0 : evaluate_assign.data.evaluate.pass_result, 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) ? string.Empty : evaluate_assign.data.chairman.name, ChairmanPosition = string.IsNullOrEmpty(evaluate_assign.data.chairman.Position) ? string.Empty : evaluate_assign.data.chairman.Position, diff --git a/BMA.EHR.Report.Service/Controllers/ProbationReportController.cs b/BMA.EHR.Report.Service/Controllers/ProbationReportController.cs index d4d672c5..d6e48698 100644 --- a/BMA.EHR.Report.Service/Controllers/ProbationReportController.cs +++ b/BMA.EHR.Report.Service/Controllers/ProbationReportController.cs @@ -1261,9 +1261,7 @@ namespace BMA.EHR.Report.Service.Controllers 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); report.ReportParameters["PassResult"].Value = evaluateAssign.GetType().GetProperty("PassResult").GetValue(evaluateAssign); - report.ReportParameters["NotPassResult"].Value = evaluateAssign.GetType().GetProperty("NotPassResult").GetValue(evaluateAssign); report.ReportParameters["ExpandMonth"].Value = evaluateAssign.GetType().GetProperty("ExpandMonth").GetValue(evaluateAssign); report.ReportParameters["ChairmanName"].Value = evaluateAssign.GetType().GetProperty("ChairmanName").GetValue(evaluateAssign); report.ReportParameters["ChairmanPosition"].Value = evaluateAssign.GetType().GetProperty("ChairmanPosition").GetValue(evaluateAssign); diff --git a/BMA.EHR.Report.Service/Reports/19-āđāļšāļšāļĢāļēāļĒāļ‡āļēāļ™āļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļāļĢāļ“āļĩāļ‚āļĒāļēāļĒāđ€āļ§āļĨāļē.trdp b/BMA.EHR.Report.Service/Reports/19-āđāļšāļšāļĢāļēāļĒāļ‡āļēāļ™āļāļēāļĢāļ›āļĢāļ°āđ€āļĄāļīāļ™āļœāļĨāļāļēāļĢāļ—āļ”āļĨāļ­āļ‡āļ›āļāļīāļšāļąāļ•āļīāļŦāļ™āđ‰āļēāļ—āļĩāđˆāļĢāļēāļŠāļāļēāļĢ āļāļĢāļ“āļĩāļ‚āļĒāļēāļĒāđ€āļ§āļĨāļē.trdp index 90c5002851dd81b8ee86b5b098e201387dce43a1..10ace667763682cdbd42a15ee8529f2484d1e567 100644 GIT binary patch delta 1803 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 LCI*QI00000%(pd`