design report แนวนอน

BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs

@@ -95,7 +95,9 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        Salary = p.Amount == null ? "0" : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber().ToThaiNumber(),
                                        AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        ExamNumber = p.ExamNumber == null ? "0" : p.ExamNumber.Value.ToString().ToThaiNumber(),
-                                       PlacementName = $"{p.Placement.Name.ToThaiNumber()} ครั้งที่ {p.Placement.Round.ToThaiNumber()}/{p.Placement.Year.ToThaiYear().ToString().ToThaiNumber()}"
+                                       PlacementName = $"{p.Placement.Name.ToThaiNumber()} ครั้งที่ {p.Placement.Round.ToThaiNumber()}/{p.Placement.Year.ToThaiYear().ToString().ToThaiNumber()}",
+                                       RemarkHorizontal = p.RemarkHorizontal,
+                                       RemarkVertical = p.RemarkVertical,
                                    }).ToList();
 
                 return report_data;
@@ -147,7 +149,9 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        Salary = p.Amount == null ? "" : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        ExamNumber = p.ExamNumber == null ? "" : p.ExamNumber.Value.ToString().ToThaiNumber(),
-                                       PlacementName = $"{p.Placement.Name.ToThaiNumber()} ครั้งที่ {p.Placement.Round.ToThaiNumber()}/{p.Placement.Year.ToThaiYear().ToString().ToThaiNumber()}"
+                                       PlacementName = $"{p.Placement.Name.ToThaiNumber()} ครั้งที่ {p.Placement.Round.ToThaiNumber()}/{p.Placement.Year.ToThaiYear().ToString().ToThaiNumber()}",
+                                       RemarkHorizontal = p.RemarkHorizontal,
+                                       RemarkVertical = p.RemarkVertical,
                                    }).ToList();
 
                 return report_data;
@@ -208,7 +212,9 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        NewPositionType = p.PositionType == null ? "" : p.PositionType.Name,
                                        NewPositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name.ToThaiNumber(),
                                        NewSalary = p.Amount == null ? "" : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
-                                       AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiShortDate2().ToThaiNumber()
+                                       AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiShortDate2().ToThaiNumber(),
+                                       RemarkHorizontal = p.RemarkHorizontal,
+                                       RemarkVertical = p.RemarkVertical,
                                    })
                                   .ToList();
 

BMA.EHR.Application/Responses/Reports/CommandType01Response.cs

@@ -22,10 +22,12 @@
 
         public string ExamNumber { get; set; } = "0";
 
-        public string PlacementName { get; set;} = string.Empty;
+        public string PlacementName { get; set; } = string.Empty;
 
         public string Seq { get; set; } = string.Empty;
 
         public string Education { get; set; } = string.Empty;
+        public string? RemarkHorizontal { get; set; } = string.Empty;
+        public string? RemarkVertical { get; set; } = string.Empty;
     }
 }

BMA.EHR.Application/Responses/Reports/CommandType03Response.cs

@@ -41,5 +41,7 @@ namespace BMA.EHR.Application.Responses.Reports
         public string? LeaveDate { get; set; } = string.Empty;
         public string? MilitaryDate { get; set; } = string.Empty;
         public string? OldSalaryDate { get; set; } = string.Empty;
+        public string? RemarkHorizontal { get; set; } = string.Empty;
+        public string? RemarkVertical { get; set; } = string.Empty;
     }
 }

BMA.EHR.Placement.Service/Controllers/PlacementController.cs

@@ -1257,13 +1257,14 @@ namespace BMA.EHR.Placement.Service.Controllers
         {
             var person = await _context.PlacementProfiles
                                 .Include(x => x.PlacementProfileDocs)
+                                .ThenInclude(x => x.Document)
                                 .FirstOrDefaultAsync(x => x.Id == personalId);
             if (person == null)
                 return Error(GlobalMessages.DataNotFound, 404);
 
-            var profileDoc = person.PlacementProfileDocs.FirstOrDefault(x => x.Id == docId);
+            var profileDoc = person.PlacementProfileDocs.FirstOrDefault(x => x.Document.Id == docId);
             if (profileDoc == null)
-                return Error(GlobalMessages.CertificateNotFound, 404);
+                return Error(GlobalMessages.FileNotFoundOnServer, 404);
             _context.PlacementProfileDocs.RemoveRange(profileDoc);
             var _docId = profileDoc.Document.Id;
             await _context.SaveChangesAsync();