From 23b3bdbbd0a0bcf495728a3fdcde0c5ec1b1f37e Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Fri, 16 Jun 2023 16:16:57 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9A=E0=B8=8A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Services/OrganizationReportService.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Services/OrganizationReportService.cs b/Services/OrganizationReportService.cs index 2426c9f..ff311f4 100644 --- a/Services/OrganizationReportService.cs +++ b/Services/OrganizationReportService.cs @@ -232,8 +232,11 @@ namespace BMA.EHR.Report.Service.Services }).ToList(); - var report2_raw_data = (from r in _context.Report2s.AsNoTracking().ToList() - join ppos in _context.ProfilePositions.AsNoTracking().ToList() on r.OrganizationPositionId equals ppos.OrganizationPositionId into r_ppos_join + var report2_raw_data = (from r in _context.Report2s.AsNoTracking().ToList() + //join opos in _context.ProfilePositions.AsNoTracking().ToList() on r.OrganizationPositionId equals opos.OrganizationPositionId into r_opos_join + //from opos_join in r_opos_join.DefaultIfEmpty() + + join ppos in _context.ProfilePositions.AsNoTracking().ToList() on r.ProfilePositionId equals ppos.Id into r_ppos_join from ppos_join in r_ppos_join.DefaultIfEmpty() //join pf in profile_data.ToList() on ppos_join.ProfileId equals pf.Id into r_pf_join //from pf_join in r_pf_join.DefaultIfEmpty()