From 0812804bc8e2776821f8ccf8580b62e8dbe2e04c Mon Sep 17 00:00:00 2001 From: Ray Shaw Date: Thu, 9 Jan 2025 11:17:19 +0800 Subject: [PATCH] develop/xl_20250102_crgbg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 调整收入分类统计业务逻辑，以符合其他报表。 --- WEB-INF/src/com/his/cwgl/ksbb/fybb/SrfltjForm.xml | 5 +++-- release/20241225_1153.text | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/WEB-INF/src/com/his/cwgl/ksbb/fybb/SrfltjForm.xml b/WEB-INF/src/com/his/cwgl/ksbb/fybb/SrfltjForm.xml index 3f86da1..1ce8c4b 100644 --- a/WEB-INF/src/com/his/cwgl/ksbb/fybb/SrfltjForm.xml +++ b/WEB-INF/src/com/his/cwgl/ksbb/fybb/SrfltjForm.xml @@ -131,8 +131,9 @@ AND c.SFRQ >=? AND c.SFRQ <=? and #select# - AND c.SFZT = 1 - AND b.JSZT = 1 + and c.SFZT != 0 + --AND c.SFZT = 1 + --AND b.JSZT = 1 group by b.ZDJFLX ,sfx.FYDL,sfx.FYZL ,fydlzd.MC,fyzlzd.MC order by b.ZDJFLX ,sfx.FYDL,sfx.FYZL ,fydlzd.MC,fyzlzd.MC ]]> diff --git a/release/20241225_1153.text b/release/20241225_1153.text index 8b541c8..7d3800a 100644 --- a/release/20241225_1153.text +++ b/release/20241225_1153.text @@ -79,6 +79,9 @@ develop/lyx_20241227_zyyz ........................................................................................................................................... <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< +develop/xl_20250102_crgbg + +调整收入分类统计业务逻辑，以符合其他报表。 ........................................................................................................................................... <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<