This commit is contained in:
parent
1552225e9c
commit
58f52cbb84
1 changed files with 19 additions and 13 deletions
|
|
@ -366,7 +366,8 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
|
|||
posLevelName = p.posLevelName,
|
||||
|
||||
IsSend = p.IsReport,
|
||||
// DocumentReject = p.DocumentReject,
|
||||
DocumentReject = p.DocumentReject,
|
||||
disciplineRejectDoc = new List<dynamic>(),
|
||||
RemarkReject = p.RemarkReject,
|
||||
IsDisciplinary = p.IsDisciplinary,
|
||||
profileType = p.profileType,
|
||||
|
|
@ -406,17 +407,22 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
|
|||
disciplineInvestigateRelevantDocs.Add(_doc);
|
||||
}
|
||||
|
||||
// var persons = new List<dynamic>();
|
||||
// foreach (var doc in _data.Persons)
|
||||
// {
|
||||
// var _doc = new
|
||||
// {
|
||||
// doc.Id,
|
||||
// doc.FileName,
|
||||
// PathName = await _documentService.ImagesPath(doc.Id)
|
||||
// };
|
||||
// disciplineInvestigateRelevantDocs.Add(_doc);
|
||||
// }
|
||||
var persons = new List<dynamic>();
|
||||
foreach (var doc in _data.Persons)
|
||||
{
|
||||
if (doc.DocumentReject != null)
|
||||
{
|
||||
var _doc = new
|
||||
{
|
||||
doc.DocumentReject.Id,
|
||||
doc.DocumentReject.FileName,
|
||||
PathName = await _documentService.ImagesPath(doc.DocumentReject.Id)
|
||||
};
|
||||
doc.disciplineRejectDoc.Add(_doc);
|
||||
}
|
||||
persons.Add(doc);
|
||||
}
|
||||
|
||||
var data = new
|
||||
{
|
||||
_data.Id,
|
||||
|
|
@ -435,7 +441,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
|
|||
_data.Result,
|
||||
_data.Director,
|
||||
_data.RespondentType,
|
||||
_data.Persons,
|
||||
persons,
|
||||
_data.Organization,
|
||||
_data.OrganizationId,
|
||||
disciplineInvestigateDocs,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue