From fec199cdd92f0bb0e21463cdb9c70cf02b8aff92 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Wed, 10 Jul 2024 20:20:37 +0700 Subject: [PATCH] fix : Correct Defect --- .../Controllers/InsigniaRequestController.cs | 1 + .../Controllers/LeaveRequestController.cs | 6 ++++-- BMA.EHR.Solution.sln | 14 +++++++------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs b/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs index 7ee7cbfd..d8854c45 100644 --- a/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs +++ b/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs @@ -177,6 +177,7 @@ namespace BMA.EHR.Insignia.Service.Controllers var rowCount = worksheet.Dimension.Rows; for (int row = 2; row <= rowCount; row++) { + if (worksheet.Cells[row, 1] == null) break; list.Add(new ImportReceiveRequest { Number = worksheet.Cells[row, 1].Value != null ? worksheet.Cells[row, 1].Value.ToString() : null, diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs index 7602ff70..9d8f51c0 100644 --- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs @@ -190,7 +190,8 @@ namespace BMA.EHR.Leave.Service.Controllers var doc = await _minIOService.UploadFileAsync(d); if (doc != null) { - leaveRequest.LeaveDocument.Add(new LeaveDocument { Document = doc }); + var a = leaveRequest.LeaveDocument.Add(new LeaveDocument { Document = doc }); + _context.Entry(a).State = Microsoft.EntityFrameworkCore.EntityState.Modified; } } } @@ -417,7 +418,8 @@ namespace BMA.EHR.Leave.Service.Controllers var doc = await _minIOService.UploadFileAsync(d); if (doc != null) { - leaveRequest.LeaveDocument.Add(new LeaveDocument { Document = doc }); + var a = leaveRequest.LeaveDocument.Add(new LeaveDocument { Document = doc }); + _context.Entry(a).State = Microsoft.EntityFrameworkCore.EntityState.Modified; } } } diff --git a/BMA.EHR.Solution.sln b/BMA.EHR.Solution.sln index c3f78122..e87d02b9 100644 --- a/BMA.EHR.Solution.sln +++ b/BMA.EHR.Solution.sln @@ -25,12 +25,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BMA.EHR.Retirement.Service" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BMA.EHR.Report.Service", "BMA.EHR.Report.Service\BMA.EHR.Report.Service.csproj", "{26FE7B1C-771B-4940-9F40-326A7AD53F1C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BMA.EHR.Leave.Service", "BMA.EHR.Leave.Service\BMA.EHR.Leave.Service.csproj", "{0F15B902-82D7-4878-B12D-B36C14E8EDBC}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BMA.EHR.Discipline.Service", "BMA.EHR.Discipline.Service\BMA.EHR.Discipline.Service.csproj", "{0145A11E-7780-437B-A86F-CBDDB50BC3D1}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BMA.EHR.Insignia", "BMA.EHR.Insignia\BMA.EHR.Insignia.csproj", "{03AB740F-AF31-423E-8546-198B914AF76F}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BMA.EHR.Leave", "BMA.EHR.Leave\BMA.EHR.Leave.csproj", "{B06C5612-2346-44B1-9D50-F8373885BD88}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -73,10 +73,6 @@ Global {26FE7B1C-771B-4940-9F40-326A7AD53F1C}.Debug|Any CPU.Build.0 = Debug|Any CPU {26FE7B1C-771B-4940-9F40-326A7AD53F1C}.Release|Any CPU.ActiveCfg = Release|Any CPU {26FE7B1C-771B-4940-9F40-326A7AD53F1C}.Release|Any CPU.Build.0 = Release|Any CPU - {0F15B902-82D7-4878-B12D-B36C14E8EDBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0F15B902-82D7-4878-B12D-B36C14E8EDBC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0F15B902-82D7-4878-B12D-B36C14E8EDBC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0F15B902-82D7-4878-B12D-B36C14E8EDBC}.Release|Any CPU.Build.0 = Release|Any CPU {0145A11E-7780-437B-A86F-CBDDB50BC3D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0145A11E-7780-437B-A86F-CBDDB50BC3D1}.Debug|Any CPU.Build.0 = Debug|Any CPU {0145A11E-7780-437B-A86F-CBDDB50BC3D1}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -85,6 +81,10 @@ Global {03AB740F-AF31-423E-8546-198B914AF76F}.Debug|Any CPU.Build.0 = Debug|Any CPU {03AB740F-AF31-423E-8546-198B914AF76F}.Release|Any CPU.ActiveCfg = Release|Any CPU {03AB740F-AF31-423E-8546-198B914AF76F}.Release|Any CPU.Build.0 = Release|Any CPU + {B06C5612-2346-44B1-9D50-F8373885BD88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B06C5612-2346-44B1-9D50-F8373885BD88}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B06C5612-2346-44B1-9D50-F8373885BD88}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B06C5612-2346-44B1-9D50-F8373885BD88}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -100,9 +100,9 @@ Global {E4E905EE-61DF-4451-B063-5C86BC7574CE} = {FA618F0C-1AF5-49AB-AE13-C020B403B64F} {3FFE378C-387F-42EA-96E2-68E63BB295F9} = {FA618F0C-1AF5-49AB-AE13-C020B403B64F} {26FE7B1C-771B-4940-9F40-326A7AD53F1C} = {FA618F0C-1AF5-49AB-AE13-C020B403B64F} - {0F15B902-82D7-4878-B12D-B36C14E8EDBC} = {FA618F0C-1AF5-49AB-AE13-C020B403B64F} {0145A11E-7780-437B-A86F-CBDDB50BC3D1} = {FA618F0C-1AF5-49AB-AE13-C020B403B64F} {03AB740F-AF31-423E-8546-198B914AF76F} = {FA618F0C-1AF5-49AB-AE13-C020B403B64F} + {B06C5612-2346-44B1-9D50-F8373885BD88} = {FA618F0C-1AF5-49AB-AE13-C020B403B64F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3111A492-1818-4438-B718-75199D8E779A}