From c22268c7eb7a0eddf836c3b8914a50243f4f4eff Mon Sep 17 00:00:00 2001
From: yangkunan <yangkunan98@aliyun.com>
Date: Mon, 23 Sep 2024 14:56:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=9F=BA=E7=A1=80=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=94=B6=E8=B4=B9=E9=9D=A2=E7=A7=AF=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 finereport/xiazuan/2_operation/项目明细弹窗.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/finereport/xiazuan/2_operation/项目明细弹窗.sql b/finereport/xiazuan/2_operation/项目明细弹窗.sql
index e781d8b..e7a7f4d 100644
--- a/finereport/xiazuan/2_operation/项目明细弹窗.sql
+++ b/finereport/xiazuan/2_operation/项目明细弹窗.sql
@@ -583,7 +583,7 @@ AND CASE WHEN (SELECT mang_project FROM ods_one_to_many_perm WHERE username  = '
             SUM( CASE WHEN a.roomstate IN ( '9', '10', '6' ) THEN 1 ELSE 0 END ) AS 已完成装修已入住,
          --   SUM(b.CalcArea) AS 收费面积
         -- 2024-09-20更新取数新逻辑：石老师确认 收费面积从房间表取
-            SUM(a.CalcArea) AS 收费面积
+            SUM(CASE WHEN a.roomstate IS NOT NULL AND a.roomstate <> '' THEN a.CalcArea ELSE 0 END) AS 收费面积
         FROM
         (
             SELECT