diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml
index ed91b6b9..74862c0b 100644
--- a/src/main/resources/mappers/estimate/estimateMapper.xml
+++ b/src/main/resources/mappers/estimate/estimateMapper.xml
@@ -474,7 +474,7 @@
 
     <select id="selectEstimateRoofList" parameterType="com.interplug.qcast.biz.estimate.dto.EstimateRequest" resultType="com.interplug.qcast.biz.estimate.dto.RoofResponse">
         /* sqlid : com.interplug.qcast.biz.estimate.selectEstimateRoofList */
-        SELECT DISTINCT
+        SELECT
               P.OBJECT_NO
             , P.PLAN_NO
             , CASE WHEN ISNUMERIC(P.SETUP_HEIGHT) = 1 THEN CAST(CONVERT(FLOAT, P.SETUP_HEIGHT) AS INT)  ELSE 0 END AS SETUP_HEIGHT
@@ -496,7 +496,11 @@
         INNER JOIN T_PLAN_INFO PI WITH (NOLOCK)
             ON P.OBJECT_NO = PI.OBJECT_NO
             AND P.PLAN_NO = PI.PLAN_NO
-        INNER JOIN T_PART_ROOF_ESTIMATE RE WITH (NOLOCK)
+        INNER JOIN (
+            SELECT *,
+                   ROW_NUMBER() OVER (PARTITION BY OBJECT_NO, PLAN_NO, ROOF_MATERIAL_ID ORDER BY CREATE_DATETIME) AS RE_RN
+            FROM T_PART_ROOF_ESTIMATE WITH (NOLOCK)
+        ) RE
             ON P.OBJECT_NO = RE.OBJECT_NO
             AND P.PLAN_NO = RE.PLAN_NO
         LEFT OUTER JOIN M_COMM_L C1 WITH (NOLOCK)
@@ -508,10 +512,22 @@
         LEFT OUTER JOIN M_COMM_L C3 WITH (NOLOCK)
             ON C3.HEAD_CD = '201300'
             AND RE.CONSTRUCT_SPECIFICATION = C3.CODE
-        LEFT OUTER JOIN TB_CANVAS_ROOF_MATERIALS_ADD CR WITH (NOLOCK)
-            ON P.OBJECT_NO = CR.OBJECT_NO
-            AND P.PLAN_NO = CR.PLAN_NO
-            AND RE.ROOF_MATERIAL_ID = CR.ROOF_MATL_CD
+        OUTER APPLY (
+            SELECT ROOF_HAJEBICHI
+            FROM (
+                SELECT ROOF_HAJEBICHI,
+                       ROW_NUMBER() OVER (ORDER BY ROOF_SEQ) AS SEQ_RN,
+                       COUNT(*) OVER ()                       AS TOTAL_CNT
+                FROM TB_CANVAS_ROOF_MATERIALS_ADD WITH (NOLOCK)
+                WHERE OBJECT_NO    = P.OBJECT_NO
+                  AND PLAN_NO      = P.PLAN_NO
+                  AND ROOF_MATL_CD = RE.ROOF_MATERIAL_ID
+            ) NUMBERED
+            WHERE NUMBERED.SEQ_RN = CASE
+                WHEN RE.RE_RN <![CDATA[<=]]> NUMBERED.TOTAL_CNT THEN RE.RE_RN
+                ELSE 1
+            END
+        ) CR
         WHERE P.OBJECT_NO = #{objectNo}
             AND P.PLAN_NO = #{planNo}
     </select>