diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml
index 0efa10dd..ff81d15c 100644
--- a/src/main/resources/mappers/estimate/estimateMapper.xml
+++ b/src/main/resources/mappers/estimate/estimateMapper.xml
@@ -391,6 +391,10 @@
                       TCI.P_AMT,
                       TCI.CIRCUIT_CFG
                   FROM T_PART_ROOF_ITEM_ESTIMATE TRI
+                           INNER JOIN T_PART_ROOF_ESTIMATE TR
+                               ON TRI.ROOF_SURFACE_ID = TR.ROOF_SURFACE_ID
+                                      AND TRI.OBJECT_NO = TR.OBJECT_NO
+                                      AND TRI.PLAN_NO = TR.PLAN_NO
                            INNER JOIN TCI
                                       ON TRI.ROOF_ITEM_NO = TCI.CIRCUIT_NO
                                           AND TRI.OBJECT_NO = TCI.OBJECT_NO
@@ -426,10 +430,14 @@
              TE.SPECIFICATION AS P_SPEC,
              ZC.P_AMT,
              (SELECT SPECIFICATION
-             FROM T_PART_ROOF_ITEM_ESTIMATE
-             WHERE OBJECT_NO = ZC.OBJECT_NO
-             AND PLAN_NO = ZC.PLAN_NO
-             AND ROOF_ITEM_NO = (ZC.ROOF_ITEM_NO + 1)) AS M_SPEC2
+             FROM T_PART_ROOF_ITEM_ESTIMATE TRI
+             INNER JOIN T_PART_ROOF_ESTIMATE TR
+            ON TRI.ROOF_SURFACE_ID = TR.ROOF_SURFACE_ID
+            AND TRI.OBJECT_NO = TR.OBJECT_NO
+            AND TRI.PLAN_NO = TR.PLAN_NO
+             WHERE TRI.OBJECT_NO = ZC.OBJECT_NO
+             AND TRI.PLAN_NO = ZC.PLAN_NO
+             AND TRI.ROOF_ITEM_NO = (ZC.ROOF_ITEM_NO + 1)) AS M_SPEC2
          FROM Z_CFG ZC
              INNER JOIN T_PART_ESTIMATE TE
          ON ZC.OBJECT_NO = TE.OBJECT_NO