From 4f32e253fd52d3d7c8ce7df8492ae9132dbe43ae Mon Sep 17 00:00:00 2001 From: Kittapath Date: Fri, 12 Jan 2024 13:30:34 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=E0=B8=9F=E0=B8=B4=E0=B8=A7=E0=B8=9A=E0=B8=B1=E0=B8=99=E0=B8=97?= =?UTF-8?q?=E0=B8=B6=E0=B8=81=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88?= =?UTF-8?q?=E0=B8=87=2019=2020?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/OrderController.cs | 19 ++++++++++++ .../Requests/CreateCommandGroup11Request.cs | 15 ++++++---- .../Controllers/CommandReportController.cs | 30 +++++++++++-------- 3 files changed, 46 insertions(+), 18 deletions(-) diff --git a/BMA.EHR.Command.Service/Controllers/OrderController.cs b/BMA.EHR.Command.Service/Controllers/OrderController.cs index e0df70e4..4414a6ee 100644 --- a/BMA.EHR.Command.Service/Controllers/OrderController.cs +++ b/BMA.EHR.Command.Service/Controllers/OrderController.cs @@ -2517,6 +2517,11 @@ namespace BMA.EHR.Command.Service.Controllers ConclusionFireNo = req.conclusionFireNo, ConclusionFireDate = req.conclusionFireDate, ConclusionFireResolution = req.conclusionFireResolution, + + CaseFault = req.caseFault, + FaultLevel = req.faultLevel, + RefRaw = req.refRaw, + Result = req.result, }; var result = await _repository.AddAsync(inserted); @@ -2570,6 +2575,10 @@ namespace BMA.EHR.Command.Service.Controllers order.ConclusionFireDate = req.conclusionFireDate; order.ConclusionFireResolution = req.conclusionFireResolution; + order.CaseFault = req.caseFault; + order.FaultLevel = req.faultLevel; + order.RefRaw = req.refRaw; + order.Result = req.result; var result = await _repository.UpdateAsync(order); return Success(result); @@ -2620,6 +2629,11 @@ namespace BMA.EHR.Command.Service.Controllers ConclusionFireNo = req.conclusionFireNo, ConclusionFireDate = req.conclusionFireDate, ConclusionFireResolution = req.conclusionFireResolution, + + CaseFault = req.caseFault, + FaultLevel = req.faultLevel, + RefRaw = req.refRaw, + Result = req.result, }; var result = await _repository.AddAsync(inserted); @@ -2673,6 +2687,11 @@ namespace BMA.EHR.Command.Service.Controllers order.ConclusionFireDate = req.conclusionFireDate; order.ConclusionFireResolution = req.conclusionFireResolution; + order.CaseFault = req.caseFault; + order.FaultLevel = req.faultLevel; + order.RefRaw = req.refRaw; + order.Result = req.result; + var result = await _repository.UpdateAsync(order); return Success(result); diff --git a/BMA.EHR.Command.Service/Requests/CreateCommandGroup11Request.cs b/BMA.EHR.Command.Service/Requests/CreateCommandGroup11Request.cs index c33e4df3..dd5e4630 100644 --- a/BMA.EHR.Command.Service/Requests/CreateCommandGroup11Request.cs +++ b/BMA.EHR.Command.Service/Requests/CreateCommandGroup11Request.cs @@ -20,14 +20,19 @@ public string signatoryPosition { get; set; } = string.Empty; - public string fault { get; set; } + public string? fault { get; set; } - public string guiltyBasis { get; set; } + public string? guiltyBasis { get; set; } - public string conclusionFireNo { get; set; } + public string? conclusionFireNo { get; set; } - public DateTime conclusionFireDate { get; set; } + public DateTime? conclusionFireDate { get; set; } - public string conclusionFireResolution { get; set; } + public string? conclusionFireResolution { get; set; } + + public string caseFault { get; set; } + public string faultLevel { get; set; } + public string refRaw { get; set; } + public string result { get; set; } } } diff --git a/BMA.EHR.Report.Service/Controllers/CommandReportController.cs b/BMA.EHR.Report.Service/Controllers/CommandReportController.cs index e2d19d57..a344ef87 100644 --- a/BMA.EHR.Report.Service/Controllers/CommandReportController.cs +++ b/BMA.EHR.Report.Service/Controllers/CommandReportController.cs @@ -1969,20 +1969,20 @@ namespace BMA.EHR.Report.Service.Controllers CaseFault = raw_data.CaseFault, FaultLevel = raw_data.FaultLevel, - RefRaw = raw_data.RefRaw, + RefRaw = raw_data.RefRaw == null ? "" : raw_data.RefRaw.ToThaiNumber(), Result = raw_data.Result, Fullname = raw_data_profile == null ? "" : raw_data_profile.FullName, Positionname = raw_data_profile == null ? "" : raw_data_profile.Positionname, - Positionno = raw_data_profile == null ? "" : raw_data_profile.Positionno, - Organizationname = raw_data_profile == null ? "" : raw_data_profile.Organizationname, - Salary = raw_data_profile == null ? "" : raw_data_profile.Salary, + Positionno = raw_data_profile == null || raw_data_profile.Positionno == null ? "" : raw_data_profile.Positionno.ToThaiNumber(), + Organizationname = raw_data_profile == null || raw_data_profile.Organizationname == null ? "" : raw_data_profile.Organizationname.ToThaiNumber(), + Salary = raw_data_profile == null || raw_data_profile.Salary == null ? "" : raw_data_profile.Salary.ToThaiNumber(), OrderDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(), SignatoryBy = raw_data.AuthorizedUserFullName, SignatoryPosition = raw_data.AuthorizedPosition, - ConclusionFireNo = raw_data.ConclusionFireNo, + ConclusionFireNo = raw_data.ConclusionFireNo == null ? "" : raw_data.ConclusionFireNo.ToThaiNumber(), ConclusionFireDate = raw_data.ConclusionFireDate == null ? "" : raw_data.ConclusionFireDate.Value.ToThaiFullDate3().ToThaiNumber(), ConclusionFireResolution = raw_data.ConclusionFireResolution, }; @@ -2062,18 +2062,22 @@ namespace BMA.EHR.Report.Service.Controllers CaseFault = raw_data.CaseFault, FaultLevel = raw_data.FaultLevel, - RefRaw = raw_data.RefRaw, + RefRaw = raw_data.RefRaw == null ? "" : raw_data.RefRaw.ToThaiNumber(), Result = raw_data.Result, Fullname = raw_data_profile == null ? "" : raw_data_profile.FullName, Positionname = raw_data_profile == null ? "" : raw_data_profile.Positionname, - Positionno = raw_data_profile == null ? "" : raw_data_profile.Positionno, - Organizationname = raw_data_profile == null ? "" : raw_data_profile.Organizationname, - Salary = raw_data_profile == null ? "" : raw_data_profile.Salary, + Positionno = raw_data_profile == null || raw_data_profile.Positionno == null ? "" : raw_data_profile.Positionno.ToThaiNumber(), + Organizationname = raw_data_profile == null || raw_data_profile.Organizationname == null ? "" : raw_data_profile.Organizationname.ToThaiNumber(), + Salary = raw_data_profile == null || raw_data_profile.Salary == null ? "" : raw_data_profile.Salary.ToThaiNumber(), OrderDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(), SignatoryBy = raw_data.AuthorizedUserFullName, SignatoryPosition = raw_data.AuthorizedPosition, + + ConclusionFireNo = raw_data.ConclusionFireNo == null ? "" : raw_data.ConclusionFireNo.ToThaiNumber(), + ConclusionFireDate = raw_data.ConclusionFireDate == null ? "" : raw_data.ConclusionFireDate.Value.ToThaiFullDate3().ToThaiNumber(), + ConclusionFireResolution = raw_data.ConclusionFireResolution, }; return command; @@ -2511,14 +2515,14 @@ namespace BMA.EHR.Report.Service.Controllers CaseFault = raw_data.CaseFault, FaultLevel = raw_data.FaultLevel, - RefRaw = raw_data.RefRaw, + RefRaw = raw_data.RefRaw == null ? "" : raw_data.RefRaw.ToThaiNumber(), Result = raw_data.Result, Fullname = raw_data_profile == null ? "" : raw_data_profile.FullName, Positionname = raw_data_profile == null ? "" : raw_data_profile.Positionname, - Positionno = raw_data_profile == null ? "" : raw_data_profile.Positionno, - Organizationname = raw_data_profile == null ? "" : raw_data_profile.Organizationname, - Salary = raw_data_profile == null ? "" : raw_data_profile.Salary, + Positionno = raw_data_profile == null || raw_data_profile.Positionno == null ? "" : raw_data_profile.Positionno.ToThaiNumber(), + Organizationname = raw_data_profile == null || raw_data_profile.Organizationname == null ? "" : raw_data_profile.Organizationname.ToThaiNumber(), + Salary = raw_data_profile == null || raw_data_profile.Salary == null ? "" : raw_data_profile.Salary.ToThaiNumber(), OrderDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(), SignatoryBy = raw_data.AuthorizedUserFullName,