From 67d88228c8dcc1973b46170ecada8780ee269592 Mon Sep 17 00:00:00 2001 From: kittapath Date: Tue, 7 Jan 2025 21:34:55 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=8A=E0=B9=87=E0=B8=84=E0=B8=AA?= =?UTF-8?q?=E0=B8=B3=E0=B8=99=E0=B8=B1=E0=B8=81=E0=B9=83=E0=B8=AB=E0=B9=89?= =?UTF-8?q?=E0=B8=AD=E0=B8=AD=E0=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/RetirementOtherController.cs | 10 ++++++---- .../Controllers/RetirementOutController.cs | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs index 81bc5bce..bcc5d787 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs @@ -103,7 +103,7 @@ namespace BMA.EHR.Retirement.Service.Controllers var retirementOthers = await _context.RetirementOthers.AsQueryable() .OrderByDescending(x => x.CreatedAt) - .Where(x => rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id))))) + // .Where(x => rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id))))) .Select(p => new { p.Id, @@ -721,7 +721,8 @@ namespace BMA.EHR.Retirement.Service.Controllers { result.Add(r); string? _null = null; - if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") + { result.Add(new { No = _null, @@ -742,7 +743,7 @@ namespace BMA.EHR.Retirement.Service.Controllers CommandExcecuteDate = _null, RemarkHorizontal = _null, RemarkVertical = _null, - }); + }); } } return Success(result); @@ -927,7 +928,8 @@ namespace BMA.EHR.Retirement.Service.Controllers { result.Add(r); string? _null = null; - if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") + { result.Add(new { No = _null, diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs index 35b274fe..b6468e2b 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs @@ -103,7 +103,7 @@ namespace BMA.EHR.Retirement.Service.Controllers var retirementOuts = await _context.RetirementOuts.AsQueryable() .OrderByDescending(x => x.CreatedAt) - .Where(x => rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id))))) + // .Where(x => rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id))))) .Select(p => new { p.Id,