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

วินัยกำหนดให้ฟิวว่างได้ รายละเอียด

Browse source
This commit is contained in:
Kittapath 2024-01-11 09:25:42 +07:00
parent 2f733cd2a6
commit 4369c35f93
23 changed files with 9215 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -74,7 +74,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
InvestigationDetail = x.InvestigationDetail,
InvestigationStatusResult = x.InvestigationStatusResult,
})
.OrderByDescending(x => x.CreatedAt)
.OrderByDescending(x => x.InvestigationDateStart)
.Skip((page - 1) * pageSize)
.Take(pageSize)
.ToList();
@ -377,12 +377,12 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
var editExtend = false;
if (data.InvestigationDateEnd != req.investigationDateEnd) editExtend = true;
data.InvestigationDetail = req.investigationDetail.Trim().ToUpper();
data.InvestigationDetail = req.investigationDetail == null ? null : req.investigationDetail.Trim().ToUpper();
data.InvestigationDetailOther = req.investigationDetailOther;
data.InvestigationDateStart = req.investigationDateStart;
data.InvestigationDateEnd = req.investigationDateEnd;
data.InvestigationDescription = req.investigationDescription;
data.InvestigationStatusResult = req.investigationStatusResult.Trim().ToUpper();
data.InvestigationStatusResult = req.investigationStatusResult == null ? null : req.investigationStatusResult.Trim().ToUpper();
data.InvestigationCauseText = req.investigationCauseText;
data.InvestigationExtendStatus = req.investigationExtendStatus;
data.InvestigationDaysExtend = req.investigationDaysExtend;
@ -399,7 +399,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
Name = sumExtend > 0 ? "ขยายครั้งที่" + sumExtend : "วันที่สืบสวน",
Num = sumExtend,
DaysExtend = data.InvestigationDaysExtend,
DateStart = sumExtend > 0 ? data.InvestigationDateEnd.Value.AddDays(data.InvestigationDaysExtend == null ? 0 : -(double)data.InvestigationDaysExtend) : data.InvestigationDateStart,
DateStart = sumExtend > 0 && data.InvestigationDateEnd != null ? data.InvestigationDateEnd.Value.AddDays(data.InvestigationDaysExtend == null ? 0 : -(double)data.InvestigationDaysExtend + 1) : data.InvestigationDateStart,
DateEnd = data.InvestigationDateEnd,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",