From 0c8f36ec0fd32be5ff905af14094cca00dcfc985 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 24 十二月 2021 10:52:34 +0800
Subject: [PATCH] 12/24  大屏修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
index bbd5ca8..0520b76 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -7829,29 +7829,28 @@
                 if (userTag != null) {
                     if (userTag.getSysFlag().equals(0)) {
                         Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName(),communityId);
-                        otherSpecialVO.setSum(otherSpecialVO.getSum() + count);
-                        otherSpecialVO.setPercent(otherSpecialVO.getSum()*100/countAll);
+                        IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
+                        otherSpecialVO.setSum(otherSpecialVO.getSum()+count);
+                        specialStatisticsVO.setTitle(userTag.getTagName());
+                        specialStatisticsVO.setSum(count);
+                        specialStatisticsVO.setPercent(specialStatisticsVO.getSum()*100/countAll);
+                        specialStatisticsVOList.add(specialStatisticsVO);
                     } else {
                         if (StringUtils.isNotEmpty(userTag.getTagName())) {
-                            if (userTag.getTagName().equals("高龄老人")) {
-                                IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
-                                specialStatisticsVO.setTitle(userTag.getTagName());
-                                specialStatisticsVO.setSum(comMngPopulationDAO.getStatisticsCount(communityId));
-                                specialStatisticsVO.setPercent(specialStatisticsVO.getSum()*100/countAll);
-                                specialStatisticsVOList.add(specialStatisticsVO);
-                            } else {
                                 IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
                                 specialStatisticsVO.setTitle(userTag.getTagName());
                                 Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName(),communityId);
+                                otherSpecialVO.setSum(otherSpecialVO.getSum()+count);
                                 specialStatisticsVO.setSum(count);
                                 specialStatisticsVO.setPercent(specialStatisticsVO.getSum()*100/countAll);
                                 specialStatisticsVOList.add(specialStatisticsVO);
-                            }
                         }
                     }
                 }
             });
         }
+        otherSpecialVO.setSum(countAll-otherSpecialVO.getSum());
+        otherSpecialVO.setPercent(otherSpecialVO.getSum()*100/countAll);
         specialStatisticsVOList.add(otherSpecialVO);
         indexInfo.setSpecialStatisticsVOList(specialStatisticsVOList);
         // 查询网格化治理

--
Gitblit v1.7.1