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