From 45b87f54c7e7eb584199e58043f813ae7be94f22 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Wed, 17 Jan 2024 11:09:49 +0700 Subject: [PATCH 1/2] change database to new server --- BMA.EHR.Leave.Service/appsettings.json | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/BMA.EHR.Leave.Service/appsettings.json b/BMA.EHR.Leave.Service/appsettings.json index 8555c0d7..d49e7ad5 100644 --- a/BMA.EHR.Leave.Service/appsettings.json +++ b/BMA.EHR.Leave.Service/appsettings.json @@ -14,11 +14,10 @@ "AllowedHosts": "*", "ConnectionStrings": { //"DefaultConnection": "User Id=sys;Password=P@ssw0rd;DBA Privilege=SYSDBA;Data Source=localhost:1521/ORCLCDB", - "DefaultConnection": "server=192.168.1.9;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", - "ExamConnection": "server=192.168.1.9;user=root;password=adminVM123;port=3306;database=bma_ehr_exam_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", + "DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", + "ExamConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_exam_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", //"LeaveConnection": "server=192.168.4.11;user=root;password=P@ssw0rd;port=3306;database=bma_ehr_leave;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;" - "LeaveConnection": "server=192.168.1.9;user=root;password=adminVM123;port=3306;database=bma_ehr_leave_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;" - + "LeaveConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_leave_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;" }, "Jwt": { "Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI", @@ -47,4 +46,4 @@ "Port": "25" }, "API": "https://bma-ehr.frappet.synology.me/api/v1" -} +} \ No newline at end of file From bb637bca36669ca4e4c99c71c6934b06a3d95b38 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Wed, 17 Jan 2024 11:29:35 +0700 Subject: [PATCH 2/2] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A?= =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B8=E0=B8=87=E0=B8=81=E0=B8=B2=E0=B8=A3?= =?UTF-8?q?=E0=B8=84=E0=B8=B4=E0=B8=94=E0=B8=A7=E0=B8=B1=E0=B8=99=E0=B8=A5?= =?UTF-8?q?=E0=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs index 5090661b..5caaac1b 100644 --- a/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs @@ -709,7 +709,8 @@ namespace BMA.EHR.Leave.Service.Controllers isLeave = govAge >= 365; break; case "LV-010": - isLeave = totalDay <= 730; + var maxEnd = new DateTime(req.StartLeaveDate.Year + 2, req.StartLeaveDate.Month, req.StartLeaveDate.Day - 1); + isLeave = req.EndLeaveDate.Date <= maxEnd; break; case "LV-011": isLeave = totalDay <= 360;