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

return dis

Browse source
This commit is contained in:
moss 2025-04-21 14:07:10 +07:00
parent 1552225e9c
commit d55489b770
1 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -366,7 +366,8 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
posLevelName = p.posLevelName, posLevelName = p.posLevelName,
IsSend = p.IsReport, IsSend = p.IsReport,
// DocumentReject = p.DocumentReject, DocumentReject = p.DocumentReject,
disciplineRejectDoc = new List<dynamic>(),
RemarkReject = p.RemarkReject, RemarkReject = p.RemarkReject,
IsDisciplinary = p.IsDisciplinary, IsDisciplinary = p.IsDisciplinary,
profileType = p.profileType, profileType = p.profileType,
@ -406,17 +407,22 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
disciplineInvestigateRelevantDocs.Add(_doc); disciplineInvestigateRelevantDocs.Add(_doc);
} }
// var persons = new List<dynamic>(); var persons = new List<dynamic>();
// foreach (var doc in _data.Persons) foreach (var doc in _data.Persons)
// { {
// var _doc = new if (doc.DocumentReject != null)
// { {
// doc.Id, var _doc = new
// doc.FileName, {
// PathName = await _documentService.ImagesPath(doc.Id) doc.DocumentReject.Id,
// }; doc.DocumentReject.FileName,
// disciplineInvestigateRelevantDocs.Add(_doc); PathName = await _documentService.ImagesPath(doc.DocumentReject.Id)
// } };
doc.disciplineRejectDoc.Add(_doc);
}
persons.Add(doc);
}
var data = new var data = new
{ {
_data.Id, _data.Id,
@ -435,7 +441,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
_data.Result, _data.Result,
_data.Director, _data.Director,
_data.RespondentType, _data.RespondentType,
_data.Persons, persons,
_data.Organization, _data.Organization,
_data.OrganizationId, _data.OrganizationId,
disciplineInvestigateDocs, disciplineInvestigateDocs,