From 9eee46f3160051bc8ea2174d48b569a1cd1f2b8e Mon Sep 17 00:00:00 2001 From: Kittapath Date: Tue, 11 Jul 2023 16:36:48 +0700 Subject: [PATCH 1/3] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?= =?UTF-8?q?=E0=B8=A1=20param=20=E0=B8=AA=E0=B8=A5=E0=B8=B0=E0=B8=AA?= =?UTF-8?q?=E0=B8=B4=E0=B8=97=E0=B8=98=E0=B9=83=E0=B8=99swagger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PlacementController.cs | 6 +++--- .../Requests/PersonDefermentRequest.cs | 3 ++- .../Requests/PersonDisclaimRequest.cs | 11 +++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 BMA.EHR.Placement.Service/Requests/PersonDisclaimRequest.cs diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index 72506862..f81b47ba 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -353,7 +353,7 @@ namespace BMA.EHR.Placement.Service.Controllers } [HttpPost("pass/deferment"), DisableRequestSizeLimit] - public async Task> UpdatePersonDeferment() + public async Task> UpdatePersonDeferment([FromForm] PersonDefermentRequest req) { var person = await _context.PlacementProfiles.FindAsync(Request.Form.ContainsKey("personalId") ? Guid.Parse(Request.Form["personalId"]) : Guid.Parse("00000000-0000-0000-0000-000000000000")); if (person == null) @@ -773,7 +773,7 @@ namespace BMA.EHR.Placement.Service.Controllers var positionPath = await _context.PositionPaths.FirstOrDefaultAsync(x => x.Id == req.PositionPathId); if (positionPath == null && req.PositionPathId != null) return Error(GlobalMessages.DataNotFound, 404); - + if (req.Id == null) { var data = new PlacementEducation @@ -808,7 +808,7 @@ namespace BMA.EHR.Placement.Service.Controllers if (education == null) return Error(GlobalMessages.EducationNotFound, 404); - education.EducationLevel = educationLevel; + education.EducationLevel = educationLevel; education.PositionPath = positionPath; education.Institute = req.Institute; education.Degree = req.Degree; diff --git a/BMA.EHR.Placement.Service/Requests/PersonDefermentRequest.cs b/BMA.EHR.Placement.Service/Requests/PersonDefermentRequest.cs index 9cd073e7..07229987 100644 --- a/BMA.EHR.Placement.Service/Requests/PersonDefermentRequest.cs +++ b/BMA.EHR.Placement.Service/Requests/PersonDefermentRequest.cs @@ -3,9 +3,10 @@ using Microsoft.EntityFrameworkCore; namespace BMA.EHR.Placement.Service.Requests { - public class PersonDisclaimRequest + public class PersonDefermentRequest { public Guid PersonalId { get; set; } public string Note { get; set; } + public FormFile? File { get; set; } } } diff --git a/BMA.EHR.Placement.Service/Requests/PersonDisclaimRequest.cs b/BMA.EHR.Placement.Service/Requests/PersonDisclaimRequest.cs new file mode 100644 index 00000000..9cd073e7 --- /dev/null +++ b/BMA.EHR.Placement.Service/Requests/PersonDisclaimRequest.cs @@ -0,0 +1,11 @@ +using BMA.EHR.Domain.Models.MetaData; +using Microsoft.EntityFrameworkCore; + +namespace BMA.EHR.Placement.Service.Requests +{ + public class PersonDisclaimRequest + { + public Guid PersonalId { get; set; } + public string Note { get; set; } + } +} From de837e1215500826b680bbfb8ee70f3730deba40 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Tue, 11 Jul 2023 17:28:31 +0700 Subject: [PATCH 2/3] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=8A?= =?UTF-8?q?=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=9F=E0=B8=B4=E0=B8=A7=E0=B8=AA?= =?UTF-8?q?=E0=B8=A5=E0=B8=B0=E0=B8=AA=E0=B8=B4=E0=B8=97=E0=B8=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PlacementController.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index f81b47ba..c1299ec4 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -113,7 +113,7 @@ namespace BMA.EHR.Placement.Service.Controllers BmaOfficer = x.IsOfficer, StatusId = x.PlacementStatus, Number = x.Number, - Disclaim = x.IsRelief, + Deferment = x.IsRelief, }).ToListAsync(); var result = new List(); @@ -133,7 +133,7 @@ namespace BMA.EHR.Placement.Service.Controllers BmaOfficer = await _documentService.CheckBmaOfficer(p.IdCard), p.StatusId, p.Number, - p.Disclaim, + p.Deferment, }; result.Add(_data); } @@ -165,7 +165,7 @@ namespace BMA.EHR.Placement.Service.Controllers BmaOfficer = x.IsOfficer, StatusId = x.PlacementStatus, Number = x.Number, - Disclaim = x.IsRelief, + Deferment = x.IsRelief, }).ToListAsync(); var result = new List(); @@ -185,7 +185,7 @@ namespace BMA.EHR.Placement.Service.Controllers BmaOfficer = await _documentService.CheckBmaOfficer(p.IdCard), p.StatusId, p.Number, - p.Disclaim, + p.Deferment, }; result.Add(_data); } From 1c99718a30416aec6a8dafe671a35b553e80eabf Mon Sep 17 00:00:00 2001 From: Kittapath Date: Tue, 11 Jul 2023 17:31:49 +0700 Subject: [PATCH 3/3] =?UTF-8?q?sort=20=E0=B8=A5=E0=B8=B3=E0=B8=94=E0=B8=B1?= =?UTF-8?q?=E0=B8=9A=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=AA=E0=B8=AD=E0=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BMA.EHR.Placement.Service/Controllers/PlacementController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index c1299ec4..b564978c 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -166,7 +166,7 @@ namespace BMA.EHR.Placement.Service.Controllers StatusId = x.PlacementStatus, Number = x.Number, Deferment = x.IsRelief, - }).ToListAsync(); + }).OrderBy(x => x.Number).ToListAsync(); var result = new List(); foreach (var p in data)