hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

แก้สืบสอบ status เพิ่มdefult

Browse source
This commit is contained in:
Kittapath 2023-12-01 09:46:39 +07:00
parent dd4a409855
commit 49d70b1e05
16 changed files with 34059 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs
View file

@ -249,6 +249,8 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
InvestigationDescription = x.InvestigationDescription,
InvestigationStatusResult = x.InvestigationStatusResult,
InvestigationCauseText = x.InvestigationCauseText,
InvestigationExtendStatus = x.InvestigationExtendStatus,
InvestigationDaysExtend = x.InvestigationDaysExtend,
Status = x.Status,//สถานะเรื่องสืบสวน
Result = x.Result,//ผลการตรวจสอบ
Director = x.DisciplineDisciplinary_DirectorInvestigates.Select(d => new
@ -307,6 +309,8 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
_data.InvestigationDescription,
_data.InvestigationStatusResult,
_data.InvestigationCauseText,
_data.InvestigationExtendStatus,
_data.InvestigationDaysExtend,
_data.Status,
_data.Result,
_data.Director,
@ -344,6 +348,8 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
data.InvestigationDescription = req.investigationDescription;
data.InvestigationStatusResult = req.investigationStatusResult.Trim().ToUpper();
data.InvestigationCauseText = req.investigationCauseText.Trim().ToUpper();
data.InvestigationExtendStatus = req.investigationExtendStatus;
data.InvestigationDaysExtend = req.investigationDaysExtend;
data.Result = req.result;
data.LastUpdateFullName = FullName ?? "System Administrator";
data.LastUpdateUserId = UserId ?? "";
@ -403,6 +409,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
DisciplinaryDateStart = x.DisciplinaryDateStart,
DisciplinaryDateEnd = x.DisciplinaryDateEnd,
DaysExtend = x.DisciplinaryDaysExtend,
ExtendStatus = x.DisciplinaryExtendStatus,
DisciplinaryDateInvestigation = x.DisciplinaryDateInvestigation,
DisciplinaryDateResult = x.DisciplinaryDateResult,
DisciplinaryStatusResult = x.DisciplinaryStatusResult,
@ -523,6 +530,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
_data.DisciplinaryDateStart,
_data.DisciplinaryDateEnd,
_data.DaysExtend,
_data.ExtendStatus,
_data.DisciplinaryDateInvestigation,
_data.DisciplinaryDateResult,
_data.DisciplinaryStatusResult,
@ -577,6 +585,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
data.DisciplinaryDateStart = req.DisciplinaryDateStart;
data.DisciplinaryDateEnd = req.DisciplinaryDateEnd;
data.DisciplinaryDaysExtend = req.DaysExtend;
data.DisciplinaryExtendStatus = req.ExtendStatus;
data.DisciplinaryDateInvestigation = req.DisciplinaryDateInvestigation;
data.DisciplinaryDateResult = req.DisciplinaryDateResult;
data.DisciplinaryStatusResult = req.DisciplinaryStatusResult;
@ -659,7 +668,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
return Error(new Exception(GlobalMessages.DataNotFound), (int)StatusCodes.Status404NotFound);
if (data.Status.Trim().ToUpper() != "NEW")
return Error(new Exception("ไม่สามารถยุติเรื่องได้"), (int)StatusCodes.Status500InternalServerError);
if (data.InvestigationStatusResult == null || data.InvestigationStatusResult.Trim().ToUpper() != "NO_CAUSE")
if (data.DisciplinaryStatusResult == null || data.DisciplinaryStatusResult.Trim().ToUpper() != "NO_CAUSE")
return Error(new Exception("ไม่สามารถยุติเรื่องได้"), (int)StatusCodes.Status500InternalServerError);
data.Status = "STOP";