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 params) { PopulationCountsDTO countsDTO = new PopulationCountsDTO(); //未知的性别 - params.put("gender","未知的性别"); + params.put("gender","3d46697d-5d0e-4fff-8470-48d08c8a0b44"); SuccessResultData unknowGender = basePopulationInfoService.countBasePopulationInfo(params); //男性 - params.put("gender","男性"); + params.put("gender","46bec29f-2368-44f7-98d0-b33246e5e16d"); SuccessResultData man = basePopulationInfoService.countBasePopulationInfo(params); //女性 - params.put("gender","女性"); + params.put("gender","4a5f549a-d339-4403-8d26-9058e80499b1"); SuccessResultData woman = basePopulationInfoService.countBasePopulationInfo(params); //未说明的性别 - params.put("gender","未说明的性别"); + params.put("gender","01fffb32-73ca-4872-9d2f-abb2158f0e07"); SuccessResultData unDiscription = basePopulationInfoService.countBasePopulationInfo(params); String xAxis = "男性,女性,未知的性别,未说明的性别"; String countsAppend = "";