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

add dna

Browse source
This commit is contained in:
kittapath 2025-02-05 17:48:58 +07:00
parent dbe6916782
commit 5ea175ca77
61 changed files with 66329 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

20
BMA.EHR.Discipline.Service/Controllers/DisciplineComplaintController.cs
View file

@ -192,18 +192,23 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
root = p.root,
rootId = p.rootId,
rootDnaId = p.rootDnaId,
rootShortName = p.rootShortName,
child1 = p.child1,
child1Id = p.child1Id,
child1DnaId = p.child1DnaId,
child1ShortName = p.child1ShortName,
child2 = p.child2,
child2Id = p.child2Id,
child2DnaId = p.child2DnaId,
child2ShortName = p.child2ShortName,
child3 = p.child3,
child3Id = p.child3Id,
child3DnaId = p.child3DnaId,
child3ShortName = p.child3ShortName,
child4 = p.child4,
child4Id = p.child4Id,
child4DnaId = p.child4DnaId,
child4ShortName = p.child4ShortName,
posMasterNo = p.posMasterNo,
posTypeId = p.posTypeId,
@ -330,18 +335,23 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
root = item.root,
rootId = item.rootId,
rootDnaId = item.rootDnaId,
rootShortName = item.rootShortName,
child1 = item.child1,
child1Id = item.child1Id,
child1DnaId = item.child1DnaId,
child1ShortName = item.child1ShortName,
child2 = item.child2,
child2Id = item.child2Id,
child2DnaId = item.child2DnaId,
child2ShortName = item.child2ShortName,
child3 = item.child3,
child3Id = item.child3Id,
child3DnaId = item.child3DnaId,
child3ShortName = item.child3ShortName,
child4 = item.child4,
child4Id = item.child4Id,
child4DnaId = item.child4DnaId,
child4ShortName = item.child4ShortName,
posMasterNo = item.posMasterNo,
posTypeId = item.posTypeId,
@ -439,18 +449,23 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
root = item.root,
rootId = item.rootId,
rootDnaId = item.rootDnaId,
rootShortName = item.rootShortName,
child1 = item.child1,
child1Id = item.child1Id,
child1DnaId = item.child1DnaId,
child1ShortName = item.child1ShortName,
child2 = item.child2,
child2Id = item.child2Id,
child2DnaId = item.child2DnaId,
child2ShortName = item.child2ShortName,
child3 = item.child3,
child3Id = item.child3Id,
child3DnaId = item.child3DnaId,
child3ShortName = item.child3ShortName,
child4 = item.child4,
child4Id = item.child4Id,
child4DnaId = item.child4DnaId,
child4ShortName = item.child4ShortName,
posMasterNo = item.posMasterNo,
posTypeId = item.posTypeId,
@ -612,18 +627,23 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
root = item.root,
rootId = item.rootId,
rootDnaId = item.rootDnaId,
rootShortName = item.rootShortName,
child1 = item.child1,
child1Id = item.child1Id,
child1DnaId = item.child1DnaId,
child1ShortName = item.child1ShortName,
child2 = item.child2,
child2Id = item.child2Id,
child2DnaId = item.child2DnaId,
child2ShortName = item.child2ShortName,
child3 = item.child3,
child3Id = item.child3Id,
child3DnaId = item.child3DnaId,
child3ShortName = item.child3ShortName,
child4 = item.child4,
child4Id = item.child4Id,
child4DnaId = item.child4DnaId,
child4ShortName = item.child4ShortName,
posMasterNo = item.posMasterNo,
posTypeId = item.posTypeId,

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

@ -501,18 +501,23 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
root = p.root,
rootId = p.rootId,
rootDnaId = p.rootDnaId,
rootShortName = p.rootShortName,
child1 = p.child1,
child1Id = p.child1Id,
child1DnaId = p.child1DnaId,
child1ShortName = p.child1ShortName,
child2 = p.child2,
child2Id = p.child2Id,
child2DnaId = p.child2DnaId,
child2ShortName = p.child2ShortName,
child3 = p.child3,
child3Id = p.child3Id,
child3DnaId = p.child3DnaId,
child3ShortName = p.child3ShortName,
child4 = p.child4,
child4Id = p.child4Id,
child4DnaId = p.child4DnaId,
child4ShortName = p.child4ShortName,
posMasterNo = p.posMasterNo,
posTypeId = p.posTypeId,
@ -762,18 +767,23 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
root = item.root,
rootId = item.rootId,
rootDnaId = item.rootDnaId,
rootShortName = item.rootShortName,
child1 = item.child1,
child1Id = item.child1Id,
child1DnaId = item.child1DnaId,
child1ShortName = item.child1ShortName,
child2 = item.child2,
child2Id = item.child2Id,
child2DnaId = item.child2DnaId,
child2ShortName = item.child2ShortName,
child3 = item.child3,
child3Id = item.child3Id,
child3DnaId = item.child3DnaId,
child3ShortName = item.child3ShortName,
child4 = item.child4,
child4Id = item.child4Id,
child4DnaId = item.child4DnaId,
child4ShortName = item.child4ShortName,
posMasterNo = item.posMasterNo,
posTypeId = item.posTypeId,
@ -1754,18 +1764,23 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
root = item.root,
rootId = item.rootId,
rootDnaId = item.rootDnaId,
rootShortName = item.rootShortName,
child1 = item.child1,
child1Id = item.child1Id,
child1DnaId = item.child1DnaId,
child1ShortName = item.child1ShortName,
child2 = item.child2,
child2Id = item.child2Id,
child2DnaId = item.child2DnaId,
child2ShortName = item.child2ShortName,
child3 = item.child3,
child3Id = item.child3Id,
child3DnaId = item.child3DnaId,
child3ShortName = item.child3ShortName,
child4 = item.child4,
child4Id = item.child4Id,
child4DnaId = item.child4DnaId,
child4ShortName = item.child4ShortName,
posMasterNo = item.posMasterNo,
posTypeId = item.posTypeId,

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

@ -248,7 +248,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
[HttpGet("{page}/{id:guid}")]
public async Task<ActionResult<ResponseObject>> GetByDisciplineInvestigate(string page,Guid id)
public async Task<ActionResult<ResponseObject>> GetByDisciplineInvestigate(string page, Guid id)
{
page = page.Trim().ToUpper();
string getPermission;
@ -268,7 +268,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
{
getPermission = await _permission.GetPermissionAPIAsync("GET", "SYS_DISCIPLINE_INVESTIGATE");
}
var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
if (jsonData["status"]?.ToString() != "200")
{
@ -334,25 +334,30 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
root = p.root,
rootId = p.rootId,
rootDnaId = p.rootDnaId,
rootShortName = p.rootShortName,
child1 = p.child1,
child1Id = p.child1Id,
child1DnaId = p.child1DnaId,
child1ShortName = p.child1ShortName,
child2 = p.child2,
child2Id = p.child2Id,
child2DnaId = p.child2DnaId,
child2ShortName = p.child2ShortName,
child3 = p.child3,
child3Id = p.child3Id,
child3DnaId = p.child3DnaId,
child3ShortName = p.child3ShortName,
child4 = p.child4,
child4Id = p.child4Id,
child4DnaId = p.child4DnaId,
child4ShortName = p.child4ShortName,
posMasterNo = p.posMasterNo,
posTypeId = p.posTypeId,
posTypeName = p.posTypeName,
posLevelId = p.posLevelId,
posLevelName = p.posLevelName,
IsSend = p.IsReport,
IsDisciplinary = p.IsDisciplinary,
profileType = p.profileType,
@ -532,18 +537,23 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
root = item.root,
rootId = item.rootId,
rootDnaId = item.rootDnaId,
rootShortName = item.rootShortName,
child1 = item.child1,
child1Id = item.child1Id,
child1DnaId = item.child1DnaId,
child1ShortName = item.child1ShortName,
child2 = item.child2,
child2Id = item.child2Id,
child2DnaId = item.child2DnaId,
child2ShortName = item.child2ShortName,
child3 = item.child3,
child3Id = item.child3Id,
child3DnaId = item.child3DnaId,
child3ShortName = item.child3ShortName,
child4 = item.child4,
child4Id = item.child4Id,
child4DnaId = item.child4DnaId,
child4ShortName = item.child4ShortName,
posMasterNo = item.posMasterNo,
posTypeId = item.posTypeId,
@ -582,12 +592,12 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(id.ToString(), "SYS_DISCIPLINE_INVESTIGATE");
if (getWorkflow == false)
{
var getPermission = await _permission.GetPermissionAPIAsync("GET", "SYS_DISCIPLINE_INVESTIGATE");
var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
if (jsonData["status"]?.ToString() != "200")
{
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
}
var getPermission = await _permission.GetPermissionAPIAsync("GET", "SYS_DISCIPLINE_INVESTIGATE");
var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
if (jsonData["status"]?.ToString() != "200")
{
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
}
}
var data = await _context.DisciplineInvestigates
.Where(x => x.Id == id)
@ -692,18 +702,23 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
root = item.root,
rootId = item.rootId,
rootDnaId = item.rootDnaId,
rootShortName = item.rootShortName,
child1 = item.child1,
child1Id = item.child1Id,
child1DnaId = item.child1DnaId,
child1ShortName = item.child1ShortName,
child2 = item.child2,
child2Id = item.child2Id,
child2DnaId = item.child2DnaId,
child2ShortName = item.child2ShortName,
child3 = item.child3,
child3Id = item.child3Id,
child3DnaId = item.child3DnaId,
child3ShortName = item.child3ShortName,
child4 = item.child4,
child4Id = item.child4Id,
child4DnaId = item.child4DnaId,
child4ShortName = item.child4ShortName,
posMasterNo = item.posMasterNo,
posTypeId = item.posTypeId,
@ -805,12 +820,12 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(id.ToString(), "SYS_DISCIPLINE_INVESTIGATE");
if (getWorkflow == false)
{
var getPermission = await _permission.GetPermissionAPIAsync("GET", "SYS_DISCIPLINE_INVESTIGATE");
var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
if (jsonData["status"]?.ToString() != "200")
{
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
}
var getPermission = await _permission.GetPermissionAPIAsync("GET", "SYS_DISCIPLINE_INVESTIGATE");
var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
if (jsonData["status"]?.ToString() != "200")
{
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
}
}
var data = await _context.DisciplineInvestigates
.Where(x => x.Id == id)

5
BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
View file

@ -167,18 +167,23 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
Organization = p.Organization,
root = p.root,
rootId = p.rootId,
rootDnaId = p.rootDnaId,
rootShortName = p.rootShortName,
child1 = p.child1,
child1Id = p.child1Id,
child1DnaId = p.child1DnaId,
child1ShortName = p.child1ShortName,
child2 = p.child2,
child2Id = p.child2Id,
child2DnaId = p.child2DnaId,
child2ShortName = p.child2ShortName,
child3 = p.child3,
child3Id = p.child3Id,
child3DnaId = p.child3DnaId,
child3ShortName = p.child3ShortName,
child4 = p.child4,
child4Id = p.child4Id,
child4DnaId = p.child4DnaId,
child4ShortName = p.child4ShortName,
posMasterNo = p.posMasterNo,
posTypeId = p.posTypeId,

12
BMA.EHR.Discipline.Service/Controllers/DisciplineSuspendController.cs
View file

@ -96,25 +96,30 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
Organization = x.Organization,
root = x.root,
rootId = x.rootId,
rootDnaId = x.rootDnaId,
rootShortName = x.rootShortName,
child1 = x.child1,
child1Id = x.child1Id,
child1DnaId = x.child1DnaId,
child1ShortName = x.child1ShortName,
child2 = x.child2,
child2Id = x.child2Id,
child2DnaId = x.child2DnaId,
child2ShortName = x.child2ShortName,
child3 = x.child3,
child3Id = x.child3Id,
child3DnaId = x.child3DnaId,
child3ShortName = x.child3ShortName,
child4 = x.child4,
child4Id = x.child4Id,
child4DnaId = x.child4DnaId,
child4ShortName = x.child4ShortName,
posMasterNo = x.posMasterNo,
posTypeId = x.posTypeId,
posTypeName = x.posTypeName,
posLevelId = x.posLevelId,
posLevelName = x.posLevelName,
Position = x.Position,
PosNo = x.PosNo,
PositionLevel = x.PositionLevel == null ? "" : x.PositionLevel,
@ -173,18 +178,23 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
Organization = x.Organization,
root = x.root,
rootId = x.rootId,
rootDnaId = x.rootDnaId,
rootShortName = x.rootShortName,
child1 = x.child1,
child1Id = x.child1Id,
child1DnaId = x.child1DnaId,
child1ShortName = x.child1ShortName,
child2 = x.child2,
child2Id = x.child2Id,
child2DnaId = x.child2DnaId,
child2ShortName = x.child2ShortName,
child3 = x.child3,
child3Id = x.child3Id,
child3DnaId = x.child3DnaId,
child3ShortName = x.child3ShortName,
child4 = x.child4,
child4Id = x.child4Id,
child4DnaId = x.child4DnaId,
child4ShortName = x.child4ShortName,
posMasterNo = x.posMasterNo,
posTypeId = x.posTypeId,