Merge pull request #1863 from Frappet/issue/#1859

ทำฟังก์ชันกลางคำนวณปีงบประมาณ
2025-10-10 10:14:34 +07:00 · 2025-10-10 10:14:34 +07:00 · 51962eea16
commit 51962eea16
parent ed1bb838ce 3d9f922fc9
2 changed files with 13 additions and 1 deletions
--- 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,
--- 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