From 3d9f922fc9b52ffac1f94a01e1f16eacfdc1bf5b Mon Sep 17 00:00:00 2001
From: harid <harid_pr61@live.rmutl.com>
Date: Thu, 9 Oct 2025 16:43:37 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=97=E0=B8=B3=E0=B8=9F=E0=B8=B1=E0=B8=87?=
 =?UTF-8?q?=E0=B8=81=E0=B9=8C=E0=B8=8A=E0=B8=B1=E0=B8=99=E0=B8=81=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=87=E0=B8=84=E0=B8=B3=E0=B8=99=E0=B8=A7=E0=B8=93?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=B5=E0=B8=87=E0=B8=9A=E0=B8=9B=E0=B8=A3=E0=B8=B0?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=B2=E0=B8=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DisciplineComplaint_AppealController.cs          |  2 +-
 BMA.EHR.Domain/Extensions/DateTimeExtension.cs       | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineComplaint_AppealController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineComplaint_AppealController.cs
index e485e60d..32a1b55f 100644
--- a/BMA.EHR.Discipline.Service/Controllers/DisciplineComplaint_AppealController.cs
+++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineComplaint_AppealController.cs
@@ -385,7 +385,7 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
                 Description = req.Description,
                 Status = "NEW",
                 Type = req.Type.Trim().ToUpper(),
-                Year = req.Year == null ? DateTime.Now.Year : req.Year,
+                Year = req.Year == null ? DateTime.Now.CalculateFisicalYear() : req.Year,
                 CaseType = req.CaseType,
                 CaseNumber = req.CaseNumber,
                 Fullname = req.Fullname,
diff --git a/BMA.EHR.Domain/Extensions/DateTimeExtension.cs b/BMA.EHR.Domain/Extensions/DateTimeExtension.cs
index 27ebc5a8..a6a07c79 100644
--- a/BMA.EHR.Domain/Extensions/DateTimeExtension.cs
+++ b/BMA.EHR.Domain/Extensions/DateTimeExtension.cs
@@ -424,6 +424,18 @@ namespace BMA.EHR.Domain.Extensions
             };
         }
 
+        public static int CalculateFisicalYear(this DateTime value)
+        {
+            if (value.Month >= 10)
+            {
+                return value.Year + 1;
+            }
+            else
+            {
+                return value.Year;
+            }
+        }
+
         #endregion
 
         #endregion