From 8a854c3b59123c49d0f3b6295389a28a15b9f88c Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 24 May 2023 10:46:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=A7=E5=B1=8F=E4=B8=AD=E5=A4=AE?=
 =?UTF-8?q?=EF=BC=8C=E5=90=84=E7=A7=8D=E4=BA=BA=E5=91=98=E7=B1=BB=E5=88=AB?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E8=8F=9C=E5=8D=95=E6=95=B0=E9=87=8F=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dao/IcResiUserDao.java     |  5 +++-
 .../impl/LingShanScreenServiceImpl.java       | 25 ++++---------------
 .../main/resources/mapper/IcResiUserDao.xml   | 17 ++++++++++++-
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
index e38980a006..4fd2411767 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
@@ -512,6 +512,9 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      * @Author: wangxianzhang
      * @Date: 2023/5/24 9:27 AM
      */
-    List<LingShanSpecialCrowdStatsByOrgResultDTO> countSpecialQtyByOrgIdPath(@Param("orgIdPath") String orgIdPath,
+    List<LingShanSpecialCrowdStatsByOrgResultDTO> countSpecialQtyOfAllSubOrg(@Param("orgIdPath") String orgIdPath,
                                                                              @Param("specialType") String specialType);
+
+    int countSpecialQtyOfOrg(@Param("orgIdPath") String orgIdPath, @Param("specialType") String specialType);
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java
index 3fc6567154..7f81fa1f66 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java
@@ -90,7 +90,7 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD
             return t;
         }).collect(Collectors.toList());
 
-        List<LingShanSpecialCrowdStatsByOrgResultDTO> ol = icResiUserDao.countSpecialQtyByOrgIdPath(PidUtils.convertPid2OrgIdPath(parentAgencyInfo.getId(), parentAgencyInfo.getPids()), specialType);
+        List<LingShanSpecialCrowdStatsByOrgResultDTO> ol = icResiUserDao.countSpecialQtyOfAllSubOrg(PidUtils.convertPid2OrgIdPath(parentAgencyInfo.getId(), parentAgencyInfo.getPids()), specialType);
 
         // 开始给rl++
         for (LingShanSpecialCrowdStatsByOrgResultDTO qtyData : ol) {
@@ -111,25 +111,10 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD
 
         ArrayList<LingShanSpecialCrowdStatsBySpecialTypeResultDTO> l = new ArrayList<>();
 
-        LambdaQueryWrapper<LingshanSpecialCrowdDetailAzbjEntity> azbjq = new LambdaQueryWrapper<>();
-        azbjq.likeRight(LingshanSpecialCrowdDetailAzbjEntity::getOrgIdPath, orgIdPath);
-        l.add(new LingShanSpecialCrowdStatsBySpecialTypeResultDTO(LingShanSpecialCrowdTypeEnums.AZBJ.getType(), LingShanSpecialCrowdTypeEnums.AZBJ.getName(), azbjDao.selectCount(azbjq)));
-
-        LambdaQueryWrapper<LingshanSpecialCrowdDetailSqjzEntity> sqjzq = new LambdaQueryWrapper<>();
-        sqjzq.likeRight(LingshanSpecialCrowdDetailSqjzEntity::getOrgIdPath, orgIdPath);
-        l.add(new LingShanSpecialCrowdStatsBySpecialTypeResultDTO(LingShanSpecialCrowdTypeEnums.SQJZ.getType(), LingShanSpecialCrowdTypeEnums.SQJZ.getName(), sqjzDao.selectCount(sqjzq)));
-
-        LambdaQueryWrapper<LingshanSpecialCrowdDetailXfryEntity> xfryq = new LambdaQueryWrapper<>();
-        xfryq.likeRight(LingshanSpecialCrowdDetailXfryEntity::getOrgIdPath, orgIdPath);
-        l.add(new LingShanSpecialCrowdStatsBySpecialTypeResultDTO(LingShanSpecialCrowdTypeEnums.XFRY.getType(), LingShanSpecialCrowdTypeEnums.XFRY.getName(), xfryDao.selectCount(xfryq)));
-
-        LambdaQueryWrapper<LingshanSpecialCrowdDetailJdryEntity> jdryq = new LambdaQueryWrapper<>();
-        jdryq.likeRight(LingshanSpecialCrowdDetailJdryEntity::getOrgIdPath, orgIdPath);
-        l.add(new LingShanSpecialCrowdStatsBySpecialTypeResultDTO(LingShanSpecialCrowdTypeEnums.JDRY.getType(), LingShanSpecialCrowdTypeEnums.JDRY.getName(), jdryDao.selectCount(jdryq)));
-
-        LambdaQueryWrapper<LingshanSpecialCrowdDetailJzhzEntity> jzhzq = new LambdaQueryWrapper<>();
-        jzhzq.likeRight(LingshanSpecialCrowdDetailJzhzEntity::getOrgIdPath, orgIdPath);
-        l.add(new LingShanSpecialCrowdStatsBySpecialTypeResultDTO(LingShanSpecialCrowdTypeEnums.JZHZ.getType(), LingShanSpecialCrowdTypeEnums.JZHZ.getName(), jzhzDao.selectCount(jzhzq)));
+        for (LingShanSpecialCrowdTypeEnums e : LingShanSpecialCrowdTypeEnums.values()) {
+            int qty = icResiUserDao.countSpecialQtyOfOrg(orgIdPath, e.getType());
+            l.add(new LingShanSpecialCrowdStatsBySpecialTypeResultDTO(e.getType(), e.getName(), qty));
+        }
 
         return l;
     }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index 0c50b87c38..731cfdaa5a 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -1743,7 +1743,7 @@
     </select>
 
     <!--根据orgIdPath计算各个组织下的特殊人群数量-->
-    <select id="countSpecialQtyByOrgIdPath"
+    <select id="countSpecialQtyOfAllSubOrg"
             resultType="com.epmet.dto.result.lingshan.LingShanSpecialCrowdStatsByOrgResultDTO">
         select count(*) quantity
              , r.PIDS   orgIdPath
@@ -1758,4 +1758,19 @@
           </if>
         group by r.PIDS
     </select>
+
+    <!--指定组织下，指定人群类别，的数量-->
+    <select id="countSpecialQtyOfOrg"
+            resultType="int">
+        select count(*) quantity
+        from ic_resi_user r
+        inner join ic_special s on (s.DEL_FLAG = 0 and r.ID = s.IC_RESI_USER)
+        where r.DEL_FLAG = 0
+        and r.PIDS like CONCAT(#{orgIdPath}, '%')
+        and s.SPECIAL_RQLB is not null
+        and s.SPECIAL_RQLB != ''
+        <if test="specialType != null and specialType != ''">
+            and s.SPECIAL_RQLB like CONCAT('%',#{specialType},'%')
+        </if>
+    </select>
 </mapper>