From 43b3d883f8465b710cbce19de172c2c624b43697 Mon Sep 17 00:00:00 2001
From: xiaoning <1097449274@qq.com>
Date: Tue, 25 Mar 2025 15:02:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E4=BD=9C=E4=B8=9A=E5=8C=BA=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E8=AE=A1=E7=AE=97=E3=80=90=E4=BD=9C=E4=B8=9A=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=9F=A5=E8=AF=A2=E6=B1=87=E6=80=BB=E3=80=91=E9=87=8C?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E5=90=84=E8=B7=A8=E6=9C=AA=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mappers/jhgk/DmYdjhMapper.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
index 6b3f76a..2556b03 100644
--- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
+++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
@@ -991,13 +991,13 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl}
         THEN 1 ELSE 0 END) AS qg_count3k,
         SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and dm_ydjh.kw in (15,4)
         THEN 1 ELSE 0 END) AS qg_count4k,
-        SUM(CASE WHEN isnull(dm_ydjh.qgfkry, '') = ''  and dm_ydjh.kw in (1,7,8) and ISNULL(dm_ydjh.slxhth, '') != ''
+        SUM(CASE WHEN isnull(dm_ydjh.qgfkry, '') = ''  and ISNULL(dm_ydjh.slxhth, '') != '' and (dm_ydjh.kw in (1,7,8) and dm_ydjh.zyq='FP2Q') or (dm_ydjh.kw not in (13,14,3,6) and dm_ydjh.zyq='FP2Q')
         THEN 1 ELSE 0 END) AS qg_count1kw,
-        SUM(CASE WHEN isnull(dm_ydjh.qgfkry, '') = ''  and dm_ydjh.kw in (10,11,12,2,5,9) and ISNULL(dm_ydjh.slxhth, '') != ''
+        SUM(CASE WHEN isnull(dm_ydjh.qgfkry, '') = ''  and ISNULL(dm_ydjh.slxhth, '') != '' and dm_ydjh.zyq='FP3Q'
         THEN 1 ELSE 0 END) AS qg_count2kw,
-        SUM(CASE WHEN isnull(dm_ydjh.qgfkry, '') = ''  and dm_ydjh.kw in (13,14,3,6) and ISNULL(dm_ydjh.slxhth, '') != ''
+        SUM(CASE WHEN isnull(dm_ydjh.qgfkry, '') = ''  and ISNULL(dm_ydjh.slxhth, '') != '' and dm_ydjh.kw in (13,14,3,6) and dm_ydjh.zyq='FP2Q'
         THEN 1 ELSE 0 END) AS qg_count3kw,
-        SUM(CASE WHEN isnull(dm_ydjh.qgfkry, '') = ''  and dm_ydjh.kw in (15,4) and ISNULL(dm_ydjh.slxhth, '') != ''
+        SUM(CASE WHEN isnull(dm_ydjh.qgfkry, '') = ''  and ISNULL(dm_ydjh.slxhth, '') != '' and dm_ydjh.zyq='FP4Q'
         THEN 1 ELSE 0 END) AS qg_count4kw
         FROM
         dm_ydjh