diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/PeerComparisonFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/PeerComparisonFormDTO.java
index 7e10d1c6f4..af8291beaa 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/PeerComparisonFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/PeerComparisonFormDTO.java
@@ -22,7 +22,7 @@ public class PeerComparisonFormDTO implements Serializable {
     /**
      * 月份Id（格式：202009）
      */
-    @NotBlank(message = "月份ID不能为空",groups = {PeerComparisonFormDTO.AddUserInternalGroup.class})
+    //@NotBlank(message = "月份ID不能为空",groups = {PeerComparisonFormDTO.AddUserInternalGroup.class})
     private String monthId;
     /**
      * 组织或网格Id
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiProfileResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiProfileResultDTO.java
index 6cc63810e2..e95933e1c1 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiProfileResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiProfileResultDTO.java
@@ -25,7 +25,7 @@ public class PublicPartiProfileResultDTO implements Serializable {
      * */
     private String monthTrend = "";
 
-    private Integer averageIssue = NumConstant.ZERO;
+    private BigDecimal averageIssue = new BigDecimal(NumConstant.ZERO);
 
     /**
      * 较上月百分比
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserJoinIndicatorGrowthRateResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserJoinIndicatorGrowthRateResultDTO.java
index 5e174b0de7..c72c561c07 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserJoinIndicatorGrowthRateResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/UserJoinIndicatorGrowthRateResultDTO.java
@@ -24,7 +24,7 @@ public class UserJoinIndicatorGrowthRateResultDTO implements Serializable {
      * */
     private String monthTrend;
 
-    private Integer averageIssue;
+    private BigDecimal averageIssue;
 
     /**
      * 较上月百分比
diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
index 67fad0617f..7296fe87ac 100644
--- a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-report-server:
     container_name: data-report-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.113
+    image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.114
 
     ports:
       - "8109:8109"
diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml
index 7f6449b159..10440d5c90 100644
--- a/epmet-module/data-report/data-report-server/pom.xml
+++ b/epmet-module/data-report/data-report-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.113</version>
+    <version>0.3.114</version>
     <artifactId>data-report-server</artifactId>
 
     <parent>
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java
index 872210194d..a133a5dab4 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java
@@ -218,8 +218,7 @@ public class IndexServiceImpl implements IndexService {
         } else if (ScreenConstant.MONTH_ID.equals(formDTO.getType())) {
             // 月(上一个月) 指数排行
             if (StringUtils.isBlank(formDTO.getMonthId())) {
-                String monthId = com.epmet.commons.tools.utils.DateUtils.format(com.epmet.commons.tools.utils.DateUtils.addDateMonths(new Date(), -1), "yyyyMMdd");
-                formDTO.setMonthId(monthId);
+                formDTO.setMonthId(DateUtils.getBeforeNMonth(1));
             }
             subAgencyIndexRankResultDTOS = screenIndexDataMonthlyDao.selectSubAgencyOrGridIndexMonthlyRank(formDTO);
             subAgencyIndexRankResultDTOS.forEach(rank -> {
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java
index 678890b7da..e796935094 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java
@@ -3,6 +3,7 @@ package com.epmet.datareport.service.fact.impl;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.datareport.constant.FactConstant;
 import com.epmet.datareport.dao.evaluationindex.screen.ScreenCustomerAgencyDao;
@@ -457,6 +458,9 @@ public class FactIndexServiceImpl implements FactIndexService {
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     public List<PeerComparisonResultDTO> peerComparison(PeerComparisonFormDTO formDTO) {
         //1.根据组织或网格Id的上级组织Id查询同级组织或网格对应类型的得分排名（按月查询）
+        if (null == formDTO.getMonthId() || "".equals(formDTO.getMonthId())) {
+            formDTO.setMonthId(DateUtils.getBeforeNMonth(1));
+        }
         List<PeerComparisonResultDTO> resultList = screenIndexDataMonthlyDao.selectScoreList(formDTO);
         return resultList;
     }
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
index 0bbd2d41d0..42f6d5753c 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
@@ -10,7 +10,7 @@
             ROUND( AVG_JOIN, 1 ) AS averageJoin,
             JOIN_TOTAL_UP_RATE AS monthIncr,
             JOIN_TOTAL_UP_FLAG AS monthTrend,
-            AVG_ISSUE AS averageIssue,
+            ROUND(AVG_ISSUE, 1) AS averageIssue,
             AVG_ISSUE_UP_RATE AS issueCompareLatestMonth,
             AVG_ISSUE_UP_FLAG AS issueCompareLatestTrend,
             AGVG_JOIN_UP_RATE AS joinCompareLatestMonth,