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

10
BMA.EHR.Discipline.Service/Controllers/DisciplineInvestigateController.cs
View file

@ -244,6 +244,8 @@ namespace BMA.EHR.DisciplineInvestigate.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.DisciplineInvestigate_Directors.Select(d => new
@ -318,6 +320,8 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
_data.InvestigationDescription,
_data.InvestigationStatusResult,
_data.InvestigationCauseText,
_data.InvestigationExtendStatus,
_data.InvestigationDaysExtend,
_data.Status,
_data.Result,
_data.Director,
@ -342,6 +346,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
public async Task<ActionResult<ResponseObject>> UpdateDisciplineInvestigate([FromBody] DisciplineInvestigateRequest req, Guid id)
{
var data = await _context.DisciplineInvestigates
.Include(x => x.DisciplineInvestigate_ProfileComplaints)
.Include(x => x.DisciplineInvestigate_Directors)
.ThenInclude(x => x.DisciplineDirector)
.Where(x => x.Id == id)
@ -358,6 +363,8 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
data.InvestigationDescription = req.investigationDescription;
data.InvestigationStatusResult = req.investigationStatusResult.Trim().ToUpper();
data.InvestigationCauseText = req.investigationCauseText;
data.InvestigationExtendStatus = req.investigationExtendStatus;
data.InvestigationDaysExtend = req.investigationDaysExtend;
data.Result = req.result;
data.LastUpdateFullName = FullName ?? "System Administrator";
data.LastUpdateUserId = UserId ?? "";
@ -496,7 +503,10 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
InvestigationDescription = data.InvestigationDescription,
InvestigationStatusResult = data.InvestigationStatusResult,
InvestigationCauseText = data.InvestigationCauseText,
InvestigationExtendStatus = data.InvestigationExtendStatus,
InvestigationDaysExtend = data.InvestigationDaysExtend,
DisciplinaryExtendStatus = false,
Status = "NEW",
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",