diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java
index 3d51412b..c2449f2b 100644
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java
@@ -217,11 +217,15 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC
                   msl.m2_model_batch_id,
                   msl.m3_model_batch_id
                 )
-           inner join tb_map_sheet_anal_data_inference  msadi
-           on msadi.anal_uid = msl.anal_uid
+           INNER JOIN tb_map_sheet_anal_data_inference  msadi
+           ON msadi.anal_uid = msl.anal_uid
            AND r.map_id ~ '^[0-9]+$'
-         AND r.map_id::bigint = msadi.map_sheet_num
-            where msl.anal_uid = :analUid
+           AND r.map_id::bigint = msadi.map_sheet_num
+           WHERE msl.anal_uid = :analUid
+           AND r.before_c is not null
+           AND r.before_p is not null
+           AND r.after_c is not null
+           AND r.after_p is not null
             ORDER BY r.uid, r.created_date DESC NULLS LAST
         ) x
         ON CONFLICT (result_uid)