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

เพิ่มฟิวบันทึกคำสั่ง 19 20

Browse source
This commit is contained in:
Kittapath 2024-01-12 13:30:34 +07:00
parent 25bac519ec
commit 4f32e253fd
3 changed files with 46 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

19
BMA.EHR.Command.Service/Controllers/OrderController.cs
View file

@ -2517,6 +2517,11 @@ namespace BMA.EHR.Command.Service.Controllers
ConclusionFireNo = req.conclusionFireNo, ConclusionFireNo = req.conclusionFireNo,
ConclusionFireDate = req.conclusionFireDate, ConclusionFireDate = req.conclusionFireDate,
ConclusionFireResolution = req.conclusionFireResolution, ConclusionFireResolution = req.conclusionFireResolution,
CaseFault = req.caseFault,
FaultLevel = req.faultLevel,
RefRaw = req.refRaw,
Result = req.result,
}; };
var result = await _repository.AddAsync(inserted); var result = await _repository.AddAsync(inserted);
@ -2570,6 +2575,10 @@ namespace BMA.EHR.Command.Service.Controllers
order.ConclusionFireDate = req.conclusionFireDate; order.ConclusionFireDate = req.conclusionFireDate;
order.ConclusionFireResolution = req.conclusionFireResolution; order.ConclusionFireResolution = req.conclusionFireResolution;
order.CaseFault = req.caseFault;
order.FaultLevel = req.faultLevel;
order.RefRaw = req.refRaw;
order.Result = req.result;
var result = await _repository.UpdateAsync(order); var result = await _repository.UpdateAsync(order);
return Success(result); return Success(result);
@ -2620,6 +2629,11 @@ namespace BMA.EHR.Command.Service.Controllers
ConclusionFireNo = req.conclusionFireNo, ConclusionFireNo = req.conclusionFireNo,
ConclusionFireDate = req.conclusionFireDate, ConclusionFireDate = req.conclusionFireDate,
ConclusionFireResolution = req.conclusionFireResolution, ConclusionFireResolution = req.conclusionFireResolution,
CaseFault = req.caseFault,
FaultLevel = req.faultLevel,
RefRaw = req.refRaw,
Result = req.result,
}; };
var result = await _repository.AddAsync(inserted); var result = await _repository.AddAsync(inserted);
@ -2673,6 +2687,11 @@ namespace BMA.EHR.Command.Service.Controllers
order.ConclusionFireDate = req.conclusionFireDate; order.ConclusionFireDate = req.conclusionFireDate;
order.ConclusionFireResolution = req.conclusionFireResolution; order.ConclusionFireResolution = req.conclusionFireResolution;
order.CaseFault = req.caseFault;
order.FaultLevel = req.faultLevel;
order.RefRaw = req.refRaw;
order.Result = req.result;
var result = await _repository.UpdateAsync(order); var result = await _repository.UpdateAsync(order);
return Success(result); return Success(result);

15
BMA.EHR.Command.Service/Requests/CreateCommandGroup11Request.cs
View file

@ -20,14 +20,19 @@
public string signatoryPosition { get; set; } = string.Empty; public string signatoryPosition { get; set; } = string.Empty;
public string fault { get; set; } public string? fault { get; set; }
public string guiltyBasis { get; set; } public string? guiltyBasis { get; set; }
public string conclusionFireNo { get; set; } public string? conclusionFireNo { get; set; }
public DateTime conclusionFireDate { get; set; } public DateTime? conclusionFireDate { get; set; }
public string conclusionFireResolution { get; set; } public string? conclusionFireResolution { get; set; }
public string caseFault { get; set; }
public string faultLevel { get; set; }
public string refRaw { get; set; }
public string result { get; set; }
} }
} }

30
BMA.EHR.Report.Service/Controllers/CommandReportController.cs
View file

@ -1969,20 +1969,20 @@ namespace BMA.EHR.Report.Service.Controllers
CaseFault = raw_data.CaseFault, CaseFault = raw_data.CaseFault,
FaultLevel = raw_data.FaultLevel, FaultLevel = raw_data.FaultLevel,
RefRaw = raw_data.RefRaw, RefRaw = raw_data.RefRaw == null ? "" : raw_data.RefRaw.ToThaiNumber(),
Result = raw_data.Result, Result = raw_data.Result,
Fullname = raw_data_profile == null ? "" : raw_data_profile.FullName, Fullname = raw_data_profile == null ? "" : raw_data_profile.FullName,
Positionname = raw_data_profile == null ? "" : raw_data_profile.Positionname, Positionname = raw_data_profile == null ? "" : raw_data_profile.Positionname,
Positionno = raw_data_profile == null ? "" : raw_data_profile.Positionno, Positionno = raw_data_profile == null || raw_data_profile.Positionno == null ? "" : raw_data_profile.Positionno.ToThaiNumber(),
Organizationname = raw_data_profile == null ? "" : raw_data_profile.Organizationname, Organizationname = raw_data_profile == null || raw_data_profile.Organizationname == null ? "" : raw_data_profile.Organizationname.ToThaiNumber(),
Salary = raw_data_profile == null ? "" : raw_data_profile.Salary, Salary = raw_data_profile == null || raw_data_profile.Salary == null ? "" : raw_data_profile.Salary.ToThaiNumber(),
OrderDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(), OrderDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(),
SignatoryBy = raw_data.AuthorizedUserFullName, SignatoryBy = raw_data.AuthorizedUserFullName,
SignatoryPosition = raw_data.AuthorizedPosition, SignatoryPosition = raw_data.AuthorizedPosition,
ConclusionFireNo = raw_data.ConclusionFireNo, ConclusionFireNo = raw_data.ConclusionFireNo == null ? "" : raw_data.ConclusionFireNo.ToThaiNumber(),
ConclusionFireDate = raw_data.ConclusionFireDate == null ? "" : raw_data.ConclusionFireDate.Value.ToThaiFullDate3().ToThaiNumber(), ConclusionFireDate = raw_data.ConclusionFireDate == null ? "" : raw_data.ConclusionFireDate.Value.ToThaiFullDate3().ToThaiNumber(),
ConclusionFireResolution = raw_data.ConclusionFireResolution, ConclusionFireResolution = raw_data.ConclusionFireResolution,
}; };
@ -2062,18 +2062,22 @@ namespace BMA.EHR.Report.Service.Controllers
CaseFault = raw_data.CaseFault, CaseFault = raw_data.CaseFault,
FaultLevel = raw_data.FaultLevel, FaultLevel = raw_data.FaultLevel,
RefRaw = raw_data.RefRaw, RefRaw = raw_data.RefRaw == null ? "" : raw_data.RefRaw.ToThaiNumber(),
Result = raw_data.Result, Result = raw_data.Result,
Fullname = raw_data_profile == null ? "" : raw_data_profile.FullName, Fullname = raw_data_profile == null ? "" : raw_data_profile.FullName,
Positionname = raw_data_profile == null ? "" : raw_data_profile.Positionname, Positionname = raw_data_profile == null ? "" : raw_data_profile.Positionname,
Positionno = raw_data_profile == null ? "" : raw_data_profile.Positionno, Positionno = raw_data_profile == null || raw_data_profile.Positionno == null ? "" : raw_data_profile.Positionno.ToThaiNumber(),
Organizationname = raw_data_profile == null ? "" : raw_data_profile.Organizationname, Organizationname = raw_data_profile == null || raw_data_profile.Organizationname == null ? "" : raw_data_profile.Organizationname.ToThaiNumber(),
Salary = raw_data_profile == null ? "" : raw_data_profile.Salary, Salary = raw_data_profile == null || raw_data_profile.Salary == null ? "" : raw_data_profile.Salary.ToThaiNumber(),
OrderDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(), OrderDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(),
SignatoryBy = raw_data.AuthorizedUserFullName, SignatoryBy = raw_data.AuthorizedUserFullName,
SignatoryPosition = raw_data.AuthorizedPosition, SignatoryPosition = raw_data.AuthorizedPosition,
ConclusionFireNo = raw_data.ConclusionFireNo == null ? "" : raw_data.ConclusionFireNo.ToThaiNumber(),
ConclusionFireDate = raw_data.ConclusionFireDate == null ? "" : raw_data.ConclusionFireDate.Value.ToThaiFullDate3().ToThaiNumber(),
ConclusionFireResolution = raw_data.ConclusionFireResolution,
}; };
return command; return command;
@ -2511,14 +2515,14 @@ namespace BMA.EHR.Report.Service.Controllers
CaseFault = raw_data.CaseFault, CaseFault = raw_data.CaseFault,
FaultLevel = raw_data.FaultLevel, FaultLevel = raw_data.FaultLevel,
RefRaw = raw_data.RefRaw, RefRaw = raw_data.RefRaw == null ? "" : raw_data.RefRaw.ToThaiNumber(),
Result = raw_data.Result, Result = raw_data.Result,
Fullname = raw_data_profile == null ? "" : raw_data_profile.FullName, Fullname = raw_data_profile == null ? "" : raw_data_profile.FullName,
Positionname = raw_data_profile == null ? "" : raw_data_profile.Positionname, Positionname = raw_data_profile == null ? "" : raw_data_profile.Positionname,
Positionno = raw_data_profile == null ? "" : raw_data_profile.Positionno, Positionno = raw_data_profile == null || raw_data_profile.Positionno == null ? "" : raw_data_profile.Positionno.ToThaiNumber(),
Organizationname = raw_data_profile == null ? "" : raw_data_profile.Organizationname, Organizationname = raw_data_profile == null || raw_data_profile.Organizationname == null ? "" : raw_data_profile.Organizationname.ToThaiNumber(),
Salary = raw_data_profile == null ? "" : raw_data_profile.Salary, Salary = raw_data_profile == null || raw_data_profile.Salary == null ? "" : raw_data_profile.Salary.ToThaiNumber(),
OrderDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(), OrderDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(),
SignatoryBy = raw_data.AuthorizedUserFullName, SignatoryBy = raw_data.AuthorizedUserFullName,