diff --git a/.github/workflows/release_Retirement.yaml b/.github/workflows/release_Retirement.yaml index b11c9b3c..173243f4 100644 --- a/.github/workflows/release_Retirement.yaml +++ b/.github/workflows/release_Retirement.yaml @@ -13,7 +13,8 @@ env: IMAGE_NAME: ehr/bma-ehr-retirement-service DEPLOY_HOST: frappet.com DEPLOY_PORT: 10102 - COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-retirement + COMPOSE_PATH: /home/frappet/docker/bma-ehr + # COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-retirement TOKEN_LINE: uxuK5hDzS2DsoC5piJBrWRLiz8GgY7iMZZldOWsDDF0 jobs: diff --git a/.github/workflows/release_command.yaml b/.github/workflows/release_command.yaml index c40eae79..d2870f61 100644 --- a/.github/workflows/release_command.yaml +++ b/.github/workflows/release_command.yaml @@ -13,7 +13,8 @@ env: IMAGE_NAME: ehr/bma-ehr-command-service DEPLOY_HOST: frappet.com DEPLOY_PORT: 10102 - COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-command + COMPOSE_PATH: /home/frappet/docker/bma-ehr + # COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-command TOKEN_LINE: uxuK5hDzS2DsoC5piJBrWRLiz8GgY7iMZZldOWsDDF0 jobs: diff --git a/.github/workflows/release_discipline.yaml b/.github/workflows/release_discipline.yaml index a8fe103a..5f6f12d2 100644 --- a/.github/workflows/release_discipline.yaml +++ b/.github/workflows/release_discipline.yaml @@ -13,7 +13,8 @@ env: IMAGE_NAME: ehr/bma-ehr-discipline-service DEPLOY_HOST: frappet.com DEPLOY_PORT: 10102 - COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-discipline + COMPOSE_PATH: /home/frappet/docker/bma-ehr + # COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-discipline TOKEN_LINE: uxuK5hDzS2DsoC5piJBrWRLiz8GgY7iMZZldOWsDDF0 jobs: diff --git a/.github/workflows/release_insignia.yaml b/.github/workflows/release_insignia.yaml index a99684f5..d6408d19 100644 --- a/.github/workflows/release_insignia.yaml +++ b/.github/workflows/release_insignia.yaml @@ -13,7 +13,8 @@ env: IMAGE_NAME: ehr/bma-ehr-insignia-service DEPLOY_HOST: frappet.com DEPLOY_PORT: 10102 - COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-insignia + COMPOSE_PATH: /home/frappet/docker/bma-ehr + # COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-insignia TOKEN_LINE: uxuK5hDzS2DsoC5piJBrWRLiz8GgY7iMZZldOWsDDF0 jobs: diff --git a/.github/workflows/release_leave.yaml b/.github/workflows/release_leave.yaml index 6ade856c..4931956a 100644 --- a/.github/workflows/release_leave.yaml +++ b/.github/workflows/release_leave.yaml @@ -13,7 +13,8 @@ env: IMAGE_NAME: ehr/bma-ehr-leave-service DEPLOY_HOST: frappet.com DEPLOY_PORT: 10102 - COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-leave + COMPOSE_PATH: /home/frappet/docker/bma-ehr + # COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-leave TOKEN_LINE: uxuK5hDzS2DsoC5piJBrWRLiz8GgY7iMZZldOWsDDF0 jobs: diff --git a/.github/workflows/release_orgEmployee.yaml b/.github/workflows/release_orgEmployee.yaml index 738fc4de..1dfce9bc 100644 --- a/.github/workflows/release_orgEmployee.yaml +++ b/.github/workflows/release_orgEmployee.yaml @@ -13,7 +13,8 @@ env: IMAGE_NAME: ehr/bma-ehr-org-employee-service DEPLOY_HOST: frappet.com DEPLOY_PORT: 10102 - COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-org-employee + COMPOSE_PATH: /home/frappet/docker/bma-ehr + # COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-org-employee TOKEN_LINE: uxuK5hDzS2DsoC5piJBrWRLiz8GgY7iMZZldOWsDDF0 jobs: diff --git a/.github/workflows/release_placement.yaml b/.github/workflows/release_placement.yaml index e49c7cc0..1139dda0 100644 --- a/.github/workflows/release_placement.yaml +++ b/.github/workflows/release_placement.yaml @@ -13,7 +13,8 @@ env: IMAGE_NAME: ehr/bma-ehr-placement-service DEPLOY_HOST: frappet.com DEPLOY_PORT: 10102 - COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-placement + COMPOSE_PATH: /home/frappet/docker/bma-ehr + # COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-placement TOKEN_LINE: uxuK5hDzS2DsoC5piJBrWRLiz8GgY7iMZZldOWsDDF0 jobs: diff --git a/.github/workflows/release_report.yaml b/.github/workflows/release_report.yaml index 42c34564..a87e741e 100644 --- a/.github/workflows/release_report.yaml +++ b/.github/workflows/release_report.yaml @@ -13,7 +13,8 @@ env: IMAGE_NAME: ehr/bma-ehr-report-v2-service DEPLOY_HOST: frappet.com DEPLOY_PORT: 10102 - COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-report-v2 + COMPOSE_PATH: /home/frappet/docker/bma-ehr + # COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-report-v2 TOKEN_LINE: uxuK5hDzS2DsoC5piJBrWRLiz8GgY7iMZZldOWsDDF0 jobs: diff --git a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs index 619df85c..9fbd6824 100644 --- a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs +++ b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs @@ -5626,7 +5626,7 @@ namespace BMA.EHR.Application.Repositories.Commands CommandAffectDate = command.CommandAffectDate, CommandNo = command.CommandNo, CommandYear = command.CommandYear.ToInteger().ToThaiYear(), - Detail = "คำสั่งลงโทษ ตัดเงินเดือน" + Detail = "คำสั่งลงโทษ ปลดออกจากราชการ" }); var _baseAPI = _configuration["API"]; @@ -5778,7 +5778,7 @@ namespace BMA.EHR.Application.Repositories.Commands commandAffectDate = command.CommandAffectDate, commandNo = command.CommandNo, commandYear = command.CommandYear.ToInteger().ToThaiYear(), - detail = "คำสั่งลงโทษ ตัดเงินเดือน" + detail = "คำสั่งลงโทษ ไล่ออกจากราชการ" }); var _baseAPI = _configuration["API"]; @@ -6418,7 +6418,7 @@ namespace BMA.EHR.Application.Repositories.Commands CommandAffectDate = command.CommandAffectDate, CommandNo = command.CommandNo, CommandYear = command.CommandYear.ToInteger().ToThaiYear(), - Detail = "คำสั่งลงโทษ ตัดเงินเดือน" + Detail = "คำสั่งลงโทษ พักจากราชการ" }); var baseAPI = _configuration["API"]; @@ -6551,7 +6551,7 @@ namespace BMA.EHR.Application.Repositories.Commands CommandAffectDate = command.CommandAffectDate, CommandNo = command.CommandNo, CommandYear = command.CommandYear.ToInteger().ToThaiYear(), - Detail = "คำสั่งลงโทษ ตัดเงินเดือน" + Detail = "คำสั่งลงโทษ ให้ออกจากราชการไว้ก่อน" }); var baseAPI = _configuration["API"]; @@ -6685,7 +6685,7 @@ namespace BMA.EHR.Application.Repositories.Commands CommandAffectDate = command.CommandAffectDate, CommandNo = command.CommandNo, CommandYear = command.CommandYear.ToInteger().ToThaiYear(), - Detail = "คำสั่งลงโทษ ตัดเงินเดือน" + Detail = "คำสั่งลงโทษ ลงโทษ ภาคทัณฑ์" }); var baseAPI = _configuration["API"]; diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs index f29c3a76..5318e880 100644 --- a/BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs +++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs @@ -777,7 +777,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers if (data.Status.Trim().ToUpper() != "NEW") return Error(new Exception("ไม่สามารถยุติเรื่องได้"), (int)StatusCodes.Status500InternalServerError); if (data.DisciplinaryStatusResult == null || data.DisciplinaryStatusResult.Trim().ToUpper() != "NO_CAUSE") - return Error(new Exception("ไม่สามารถยุติเรื่องได้"), (int)StatusCodes.Status500InternalServerError); + return Error(new Exception("ไม่สามารถยุติเรื่องได้ จะสามารถยุติเรื่องได้ในกรณีผลการสืบสวนไม่มีมูล"), (int)StatusCodes.Status500InternalServerError); data.Status = "STOP"; await _context.SaveChangesAsync(); diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineInvestigateController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineInvestigateController.cs index 1b9b0d6b..5c697c93 100644 --- a/BMA.EHR.Discipline.Service/Controllers/DisciplineInvestigateController.cs +++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineInvestigateController.cs @@ -540,7 +540,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers if (data.Status.Trim().ToUpper() != "NEW") return Error(new Exception("ไม่สามารถยุติเรื่องได้"), StatusCodes.Status500InternalServerError); if (data.InvestigationStatusResult == null || data.InvestigationStatusResult.Trim().ToUpper() != "NO_CAUSE") - return Error(new Exception("ไม่สามารถยุติเรื่องได้"), StatusCodes.Status500InternalServerError); + return Error(new Exception("ไม่สามารถยุติเรื่องได้ จะสามารถยุติเรื่องได้ในกรณีผลการสืบสวนไม่มีมูล"), StatusCodes.Status500InternalServerError); data.Status = "STOP"; await _context.SaveChangesAsync(); diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs index 87313568..837c5165 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs @@ -415,12 +415,12 @@ namespace BMA.EHR.Placement.Service.Controllers if (uppdated == null) return Error(GlobalMessages.PlacementOfficerNotFound, 404); - uppdated.PositionNumberOld = req.PositionNumberOld; - uppdated.PositionOld = req.PositionOld; + //uppdated.PositionNumberOld = req.PositionNumberOld; + //uppdated.PositionOld = req.PositionOld; uppdated.OrganizationPositionOld = req.OrganizationPositionOld; - uppdated.PositionLevelOld = req.PositionLevelOld; - uppdated.PositionTypeOld = req.PositionTypeOld; - uppdated.AmountOld = req.AmountOld; + //uppdated.PositionLevelOld = req.PositionLevelOld; + //uppdated.PositionTypeOld = req.PositionTypeOld; + //uppdated.AmountOld = req.AmountOld; uppdated.Organization = req.Organization; uppdated.Reason = req.Reason; uppdated.DateStart = req.DateStart; diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs index 0496c288..ece8fd56 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs @@ -296,15 +296,15 @@ namespace BMA.EHR.Placement.Service.Controllers if (uppdated == null) return Error(GlobalMessages.PlacementRepatriationNotFound, 404); - uppdated.PositionNumberOld = req.PositionNumberOld; - uppdated.DateRepatriation = req.DateRepatriation; - uppdated.OrganizationPositionOld = req.OrganizationPositionOld; - uppdated.PositionLevelOld = req.PositionLevelOld; - uppdated.PositionTypeOld = req.PositionTypeOld; - uppdated.AmountOld = req.AmountOld; - uppdated.Organization = req.Organization; - uppdated.Reason = req.Reason; - uppdated.Date = req.Date; + uppdated.PositionNumberOld = req.PositionNumberOld;// + uppdated.DateRepatriation = req.DateRepatriation;// + uppdated.OrganizationPositionOld = req.OrganizationPositionOld;// + uppdated.PositionLevelOld = req.PositionLevelOld;// + uppdated.PositionTypeOld = req.PositionTypeOld;// + uppdated.AmountOld = req.AmountOld;// + uppdated.Organization = req.Organization;// + uppdated.Reason = req.Reason;// + uppdated.Date = req.Date;// uppdated.LastUpdateFullName = FullName ?? "System Administrator"; uppdated.LastUpdateUserId = UserId ?? ""; uppdated.LastUpdatedAt = DateTime.Now;