From 8a6375edade9f1edc194a0381369fe94e56c13c7 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 13 八月 2021 13:16:36 +0800
Subject: [PATCH] Merge branch 'txb'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
index 8dafd4a..b769e6a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -275,15 +275,15 @@
             ",(select count(id) from com_mng_population where act_id = #{communityId} and out_or_local = 2) as outTotal " +
             ",(select count(id) from com_mng_population where act_id = #{communityId} and label is not null) as specialTotal " +
             ",(select count(village_id) from com_mng_village where community_id = #{communityId}) as villageTotal " +
-            ",(select count(id) from com_drug_population where community_id = #{communityId}) as drugTotal " +
-            ",(select count(id) from com_correct_population where community_id = #{communityId}) as correctTotal  " +
-            ",(select count(id) from com_major_population where community_id = #{communityId}) as majorTotal   " +
-            ",(select count(id) from com_cult_population where community_id = #{communityId}) as cultTotal   " +
-            ",(select count(id) from com_rehabilitation_population where community_id = #{communityId}) as rehabilitationTotal " +
-			",(select count(id) from com_key_population where community_id = #{communityId}) as keyTotal " +
-			",(select count(id) from com_veterans_population where community_id = #{communityId}) as veteransTotal " +
-			",(select count(id) from com_disability_population where community_id = #{communityId}) as disabilityTotal" +
-			",(select count(id) from com_low_security_population where community_id = #{communityId}) as lowSecurityTotal " +
+            ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','吸毒人员','%')) as drugTotal " +
+            ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','社区矫正','%')) as correctTotal " +
+            ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','精神障碍患者','%')) as majorTotal " +
+            ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','邪教人员','%')) as cultTotal " +
+            ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','刑满释放','%')) as rehabilitationTotal " +
+            ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','重点人员','%')) as keyTotal " +
+            ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','退役军人','%')) as veteransTotal " +
+            ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','残疾人','%')) as disabilityTotal " +
+            ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','低保户','%')) as lowSecurityTotal " +
             " from com_mng_population as cmp where act_id = #{communityId}")
     ComMngPopulationTotalVO getPopulationTotalByAdmin(@Param("communityId") Long communityId);
 

--
Gitblit v1.7.1