From 0694ea8f94fa58dd384e35f3c480cb98bc263326 Mon Sep 17 00:00:00 2001
From: wans <747101512@qq.com>
Date: Wed, 28 Apr 2021 18:20:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=AF=BC=E5=85=A5=E6=98=AF=E6=9F=A5=E8=AF=A2=E6=80=A7?=
 =?UTF-8?q?=E5=88=AB=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BasePopulationInfoServiceImpl.java               | 6 ++++--
 .../impl/PopulationCountsServiceImpl.java                 | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/cm/population/service/basepopulationinfo/impl/BasePopulationInfoServiceImpl.java b/src/main/java/com/cm/population/service/basepopulationinfo/impl/BasePopulationInfoServiceImpl.java
index f2ed11c..f3f0977 100644
--- a/src/main/java/com/cm/population/service/basepopulationinfo/impl/BasePopulationInfoServiceImpl.java
+++ b/src/main/java/com/cm/population/service/basepopulationinfo/impl/BasePopulationInfoServiceImpl.java
@@ -307,8 +307,10 @@ public class BasePopulationInfoServiceImpl extends AbstractService implements IB
         if(populationInfoDTO == null){
             return new BasePopulationInfoDTO();
         }
-        DataDictionaryDTO dictDto = dataDictionaryService.getDictionaryById(populationInfoDTO.getGender());
-        populationInfoDTO.setGender(dictDto == null ? "" : dictDto.getDictionaryName());
+        if(!"".equals(populationInfoDTO.getGender())){
+            DataDictionaryDTO dictDto = dataDictionaryService.getDictionaryById(populationInfoDTO.getGender());
+            populationInfoDTO.setGender(dictDto == null ? "" : dictDto.getDictionaryName());
+        }
         return populationInfoDTO;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/cm/population/service/populationcounts/impl/PopulationCountsServiceImpl.java b/src/main/java/com/cm/population/service/populationcounts/impl/PopulationCountsServiceImpl.java
index a760707..5988161 100644
--- a/src/main/java/com/cm/population/service/populationcounts/impl/PopulationCountsServiceImpl.java
+++ b/src/main/java/com/cm/population/service/populationcounts/impl/PopulationCountsServiceImpl.java
@@ -136,16 +136,16 @@ public class PopulationCountsServiceImpl extends BaseService implements IPopulat
     public PopulationCountsDTO getGenderECharts(Map<String, Object> params) {
         PopulationCountsDTO countsDTO = new PopulationCountsDTO();
         //未知的性别
-        params.put("gender","未知的性别");
+        params.put("gender","3d46697d-5d0e-4fff-8470-48d08c8a0b44");
         SuccessResultData<Integer> unknowGender = basePopulationInfoService.countBasePopulationInfo(params);
         //男性
-        params.put("gender","男性");
+        params.put("gender","46bec29f-2368-44f7-98d0-b33246e5e16d");
         SuccessResultData<Integer> man = basePopulationInfoService.countBasePopulationInfo(params);
         //女性
-        params.put("gender","女性");
+        params.put("gender","4a5f549a-d339-4403-8d26-9058e80499b1");
         SuccessResultData<Integer> woman = basePopulationInfoService.countBasePopulationInfo(params);
         //未说明的性别
-        params.put("gender","未说明的性别");
+        params.put("gender","01fffb32-73ca-4872-9d2f-abb2158f0e07");
         SuccessResultData<Integer> unDiscription = basePopulationInfoService.countBasePopulationInfo(params);
         String xAxis = "男性,女性,未知的性别,未说明的性别";
         String countsAppend = "";