diff --git a/Controllers/ProfileReportController.cs b/Controllers/ProfileReportController.cs
index 7c7feaf..886ea21 100644
--- a/Controllers/ProfileReportController.cs
+++ b/Controllers/ProfileReportController.cs
@@ -105,6 +105,7 @@ namespace BMA.EHR.Report.Service.Controllers
                                    p.FirstName,
                                    p.LastName,
                                    DateOfBirth = p.BirthDate.ToThaiShortDate(),
+                                   DateRetire = p.BirthDate.CalculateRetireDate().ToThaiShortDate(),
                                    RegistrationAddress = p.RegistrationAddress,
                                    RegistrationProvince = _context.Provinces.AsQueryable().FirstOrDefault(x => x.Id == p.RegistrationProvinceId)?.Name,
                                    RegistrationDistrict = _context.Districts.AsQueryable().FirstOrDefault(x => x.Id == p.RegistrationDistrictId)?.Name,
@@ -132,6 +133,7 @@ namespace BMA.EHR.Report.Service.Controllers
                         FirstName = profile.FirstName,
                         LastName = profile.LastName,
                         DateOfBirth = profile.DateOfBirth,
+                        DateRetire = profile.DateRetire,
                         RegistrationAddress = $"{profile.RegistrationAddress}\r\nตำบล/แขวง {profile.RegistrationSubDistrict}\r\nเขต/อำเภอ {profile.RegistrationDistrict}\r\nจังหวัด {profile.RegistrationProvince}  รหัสไปรษณีย์ {profile.RegistrationZipCode}",
                         SalaryAmount = profile.SalaryAmount,
                         Education = profile.Education,
@@ -184,6 +186,7 @@ namespace BMA.EHR.Report.Service.Controllers
                             FirstName = profile.FirstName,
                             LastName = profile.LastName,
                             DateOfBirth = profile.DateOfBirth,
+                            DateRetire = profile.DateRetire,
                             RegistrationAddress = $"{profile.RegistrationAddress}\r\nตำบล/แขวง {profile.RegistrationSubDistrict}\r\nเขต/อำเภอ {profile.RegistrationDistrict}\r\nจังหวัด {profile.RegistrationProvince}  รหัสไปรษณีย์ {profile.RegistrationZipCode}",
                             SalaryAmount = profile.SalaryAmount,
                             Education = profile.Education,
@@ -206,6 +209,7 @@ namespace BMA.EHR.Report.Service.Controllers
                             FirstName = profile.FirstName,
                             LastName = profile.LastName,
                             DateOfBirth = profile.DateOfBirth,
+                            DateRetire = profile.DateRetire,
                             RegistrationAddress = $"{profile.RegistrationAddress}\r\nตำบล/แขวง {profile.RegistrationSubDistrict}\r\nเขต/อำเภอ {profile.RegistrationDistrict}\r\nจังหวัด {profile.RegistrationProvince}  รหัสไปรษณีย์ {profile.RegistrationZipCode}",
                             SalaryAmount = profile.SalaryAmount,
                             Education = profile.Education,
diff --git a/Report/Profile/rptShortKp7.trdp b/Report/Profile/rptShortKp7.trdp
index 0376daa..1c3b227 100644
Binary files a/Report/Profile/rptShortKp7.trdp and b/Report/Profile/rptShortKp7.trdp differ
diff --git a/appsettings.Development.json b/appsettings.Development.json
index 034d9c4..11096b0 100644
--- a/appsettings.Development.json
+++ b/appsettings.Development.json
@@ -15,7 +15,7 @@
     "ConnectionStrings": {
         "MongoConnection": "mongodb://admin:adminVM123@127.0.0.1:27017",
         "RecruitConnection": "server=127.0.0.1;user=root;password=P@ssw0rd;port=3308;database=bma_recruit;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
-        "EHRConnection": "server=192.168.1.9;user=root;password=adminVM123;port=4061;database=bma_ehr;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
+        "EHRConnection": "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=127.0.0.1;user=root;password=P@ssw0rd;port=3308;database=bma_ehr_exam;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
     },
     "Jwt": {