diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index 3a8ea2e..c12c47d 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -5,7 +5,7 @@
       <driver-ref>mysql.8</driver-ref>
       <synchronize>true</synchronize>
       <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
-      <jdbc-url>jdbc:mysql://172.18.96.11:3306</jdbc-url>
+      <jdbc-url>jdbc:mysql://172.18.96.20:3306</jdbc-url>
       <jdbc-additional-properties>
         <property name="com.intellij.clouds.kubernetes.db.host.port" />
         <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
index b5ccf60..28009e2 100644
--- a/.idea/sqldialects.xml
+++ b/.idea/sqldialects.xml
@@ -8,6 +8,7 @@
     <file url="file://$PROJECT_DIR$/dw/dim/dim_engine_equipment_d.sql" dialect="MySQL" />
     <file url="file://$PROJECT_DIR$/dw/dim/dim_parking_info_d.sql" dialect="MySQL" />
     <file url="file://$PROJECT_DIR$/dw/dim/dim_project_base_info_d.sql" dialect="MySQL" />
+    <file url="file://$PROJECT_DIR$/dw/dim/dim_room_d.sql" dialect="MySQL" />
     <file url="file://$PROJECT_DIR$/dw/dwd/dwd_business_contract_info_d.sql" dialect="MySQL" />
     <file url="file://$PROJECT_DIR$/dw/dwd/dwd_engine_equipment_inspection_task_d.sql" dialect="MySQL" />
     <file url="file://$PROJECT_DIR$/dw/dwd/dwd_engine_equipment_status_d.sql" dialect="MySQL" />
diff --git a/finereport/xiazuan/2_operation/项目明细弹窗.sql b/finereport/xiazuan/2_operation/项目明细弹窗.sql
index 1312101..e781d8b 100644
--- a/finereport/xiazuan/2_operation/项目明细弹窗.sql
+++ b/finereport/xiazuan/2_operation/项目明细弹窗.sql
@@ -581,7 +581,9 @@ AND CASE WHEN (SELECT mang_project FROM ods_one_to_many_perm WHERE username  = '
             SUM( CASE WHEN a.roomstate IN ( '9', '10', '5', '6' ) THEN 1 ELSE 0 END ) AS 已完成装修户数,
             SUM( CASE WHEN a.roomstate = '5' THEN 1 ELSE 0 END ) AS 已完成装修未入住,
             SUM( CASE WHEN a.roomstate IN ( '9', '10', '6' ) THEN 1 ELSE 0 END ) AS 已完成装修已入住,
-            SUM(b.CalcArea) AS 收费面积
+         --   SUM(b.CalcArea) AS 收费面积
+        -- 2024-09-20更新取数新逻辑：石老师确认 收费面积从房间表取
+            SUM(a.CalcArea) AS 收费面积
         FROM
         (
             SELECT