From 58f52cbb84d72e6ab07592539d260135cbe83540 Mon Sep 17 00:00:00 2001
From: moss <>
Date: Mon, 21 Apr 2025 14:07:10 +0700
Subject: [PATCH] return dis

---
 .../DisciplineInvestigateController.cs        | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineInvestigateController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineInvestigateController.cs
index d945d358..fca63951 100644
--- a/BMA.EHR.Discipline.Service/Controllers/DisciplineInvestigateController.cs
+++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineInvestigateController.cs
@@ -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,