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

Merge branch 'develop' of github.com:Frappet/BMA-EHR-BackEnd into develop

Browse source
This commit is contained in:
Kittapath 2024-01-22 17:20:57 +07:00
commit 31c21469ec
13 changed files with 3455 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -631,7 +631,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
data.DisciplineDisciplinaryExtends.Add(
new DisciplineDisciplinaryExtend
{
Name = sumExtend > 0 ? "ขยายครั้งที่" + sumExtend : "วันที่สอบสวน",
Name = sumExtend > 0 ? "ขยายครั้งที่ " + sumExtend : "วันที่สอบสวน",
Num = sumExtend,
DaysExtend = data.DisciplinaryDaysExtend,
DateStart = sumExtend > 0 && data.DisciplinaryDateEnd != null ? data.DisciplinaryDateEnd.Value.AddDays(data.DisciplinaryDaysExtend == null ? 0 : -(double)data.DisciplinaryDaysExtend + 1) : data.DisciplinaryDateStart,
@ -657,8 +657,8 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
new DisciplineDisciplinary_DirectorInvestigate
{
DisciplineDirector = director,
Duty = isDirector == null ? "" : isDirector.Duty,
CommandNo = isDirector == null ? "" : isDirector.CommandNo,
Duty = isDirector == null ? null : isDirector.Duty,
CommandNo = isDirector == null ? null : isDirector.CommandNo,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
CreatedAt = DateTime.Now,