diff --git a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml
index 60b4c0c..2f8c92e 100644
--- a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml
+++ b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml
@@ -270,27 +270,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{saAggParam.useYearEnd} as useYearEnd,
             #{saAggParam.useMonthStart} as useMonthStart,
             #{saAggParam.useMonthEnd}  as useMonthEnd,
-            <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+            <if test="groupFieldList.contains('customName') ">
                 current_month.custom_id,
                 current_month.custom_name,
             </if>
-            <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+            <if test="groupFieldList.contains('zoneName') ">
                 current_month.zone_id,
                 current_month.zone_name,
             </if>
-            <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+            <if test="groupFieldList.contains('saleTypeName')">
                 current_month.sale_type_id,
                 current_month.sale_type_name,
             </if>
-            <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+            <if test="groupFieldList.contains('salerName')">
                 current_month.saler_id,
                 current_month.saler_name,
             </if>
-            <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+            <if test="groupFieldList.contains('dosageName')">
                 current_month.dosage_id,
                 current_month.dosage_name,
             </if>
-            <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+            <if test="groupFieldList.contains('stdGoodsName')">
                 current_month.std_goods_name,
             </if>
             current_month.this_month_sa_qty AS this_month_sa_qty,
@@ -351,32 +351,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </trim>
             FROM ( SELECT
-            <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+            <if test="groupFieldList.contains('customName')">
                 custom_id,
                 custom_name ,
             </if>
 
-            <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+            <if test="groupFieldList.contains('stdGoodsName')">
                 std_goods_name,
             </if>
 
-            <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+            <if test="groupFieldList.contains('zoneName')">
                 zone_id,
                 zone_name,
             </if>
-            <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+            <if test="groupFieldList.contains('saleTypeName')">
                 sale_type_id,
                 sale_type_name,
             </if>
-            <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+            <if test="groupFieldList.contains('dosageName')">
                 dosage_id,
                 dosage_name,
             </if>
 
-        <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
-            saler_id,
-            saler_name,
-        </if>
+            <if test="groupFieldList.contains('salerName')">
+                saler_id,
+                saler_name,
+            </if>
         ifnull(sum(this_month_sa_qty), 0) AS this_month_sa_qty,
         ifnull(sum(this_month_sa_money), 0) AS this_month_sa_money,
         ifnull(sum(this_month_cost), 0) AS this_month_cost,
@@ -430,26 +430,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         GROUP BY
         <trim suffixOverrides=",">
-            <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+            <if test="groupFieldList.contains('customName')">
                 custom_id,
                 custom_name ,
             </if>
-            <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+            <if test="groupFieldList.contains('stdGoodsName')">
                 std_goods_name,
             </if>
-            <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+            <if test="groupFieldList.contains('zoneName')">
                 zone_id,
                 zone_name,
             </if>
-            <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+            <if test="groupFieldList.contains('saleTypeName')">
                 sale_type_id,
                 sale_type_name,
             </if>
-            <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+            <if test="groupFieldList.contains('dosageName')">
                 dosage_id,
                 dosage_name,
             </if>
-            <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+            <if test="groupFieldList.contains('salerName')">
                 saler_id,
                 saler_name,
             </if>
@@ -458,22 +458,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="params.isOneYear" >
             LEFT JOIN (
             SELECT
-            <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+            <if test="groupFieldList.contains('customName')">
                 custom_id,
             </if>
-            <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+            <if test="groupFieldList.contains('stdGoodsName')">
                 std_goods_name,
             </if>
-            <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+            <if test="groupFieldList.contains('zoneName')">
                 zone_id,
             </if>
-            <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+            <if test="groupFieldList.contains('saleTypeName')">
                 sale_type_id,
             </if>
-            <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+            <if test="groupFieldList.contains('dosageName')">
                 dosage_id,
             </if>
-            <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+            <if test="groupFieldList.contains('salerName')">
                 saler_id,
             </if>
             ifnull(SUM(this_month_sa_qty), 0) AS yoy_month_sa_qty,
@@ -528,43 +528,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </where>
             GROUP BY
             <trim suffixOverrides=",">
-                <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+                <if test="groupFieldList.contains('customName')">
                     custom_id,
                 </if>
-                <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+                <if test="groupFieldList.contains('stdGoodsName')">
                     std_goods_name,
                 </if>
-                <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+                <if test="groupFieldList.contains('zoneName')">
                     zone_id,
                 </if>
-                <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+                <if test="groupFieldList.contains('saleTypeName')">
                     sale_type_id,
                 </if>
-                <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+                <if test="groupFieldList.contains('dosageName')">
                     dosage_id,
                 </if>
-                <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+                <if test="groupFieldList.contains('salerName')">
                     saler_id,
                 </if>
             </trim>
             ) yoy_month  ON
             <trim prefixOverrides="and">
-                <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+                <if test="groupFieldList.contains('customName')">
                     AND yoy_month.custom_id = current_month.custom_id
                 </if>
-                <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+                <if test="groupFieldList.contains('stdGoodsName')">
                     AND yoy_month.std_goods_name = current_month.std_goods_name
                 </if>
-                <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+                <if test="groupFieldList.contains('zoneName')">
                     AND yoy_month.zone_id = current_month.zone_id
                 </if>
-                <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+                <if test="groupFieldList.contains('saleTypeName')">
                     AND yoy_month.sale_type_id = current_month.sale_type_id
                 </if>
-                <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+                <if test="groupFieldList.contains('dosageName')">
                     AND yoy_month.dosage_id = current_month.dosage_id
                 </if>
-                <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+                <if test="groupFieldList.contains('salerName')">
                     AND yoy_month.saler_id = current_month.saler_id
                 </if>
             </trim>
@@ -580,49 +580,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             (use_year * 100 + use_month) &gt;= (#{saAggParam.useYearStart} * 100 + #{saAggParam.useMonthStart})
             AND (use_year * 100 + use_month) &lt;= (#{saAggParam.useYearEnd} * 100 + #{saAggParam.useMonthEnd})
         ) total_month_data
-        <where>
-            <if test="saAggParam.zoneName != null  and saAggParam.zoneName != ''"> and current_month.zone_name in
-                <foreach collection="saAggParam.zoneName" item="name" open="(" separator="," close=")">
-                    #{name}
-                </foreach>
-            </if>
-            <if test="saAggParam.saleTypeName != null  and saAggParam.saleTypeName != ''"> and current_month.sale_type_name in
-                <foreach collection="saAggParam.saleTypeName" item="name" open="(" separator="," close=")">
-                    #{name}
-                </foreach>
-            </if>
-            <if test="saAggParam.customName != null  and saAggParam.customName != ''"> and current_month.custom_name in
-                <foreach collection="saAggParam.customName" item="name" open="(" separator="," close=")">
-                    #{name}
-                </foreach>
-            </if>
-            <if test="saAggParam.dosageName != null  and saAggParam.dosageName != ''"> and current_month.dosage_name in
-                <foreach collection="saAggParam.dosageName" item="name" open="(" separator="," close=")">
-                    #{name}
-                </foreach>
-            </if>
-            <if test="saAggParam.goodsName != null  and saAggParam.goodsName != ''"> and current_month.goods_name in
-                <foreach collection="saAggParam.goodsName" item="name" open="(" separator="," close=")">
-                    #{name}
-                </foreach>
-            </if>
-            <if test="saAggParam.provinceName != null  and saAggParam.provinceName != ''"> and current_month.province_name in
-                <foreach collection="saAggParam.provinceName" item="name" open="(" separator="," close=")">
-                    #{name}
-                </foreach>
-            </if>
-            <if test="saAggParam.salerName != null  and saAggParam.salerName != ''"> and current_month.saler_name in
-                <foreach collection="saAggParam.salerName" item="name" open="(" separator="," close=")">
-                    #{name}
-                </foreach>
-            </if>
+<!--        <where>-->
+<!--            <if test="saAggParam.zoneName != null  and saAggParam.zoneName != ''"> and current_month.zone_name in-->
+<!--                <foreach collection="saAggParam.zoneName" item="name" open="(" separator="," close=")">-->
+<!--                    #{name}-->
+<!--                </foreach>-->
+<!--            </if>-->
+<!--            <if test="saAggParam.saleTypeName != null  and saAggParam.saleTypeName != ''"> and current_month.sale_type_name in-->
+<!--                <foreach collection="saAggParam.saleTypeName" item="name" open="(" separator="," close=")">-->
+<!--                    #{name}-->
+<!--                </foreach>-->
+<!--            </if>-->
+<!--            <if test="saAggParam.customName != null  and saAggParam.customName != ''"> and current_month.custom_name in-->
+<!--                <foreach collection="saAggParam.customName" item="name" open="(" separator="," close=")">-->
+<!--                    #{name}-->
+<!--                </foreach>-->
+<!--            </if>-->
+<!--            <if test="saAggParam.dosageName != null  and saAggParam.dosageName != ''"> and current_month.dosage_name in-->
+<!--                <foreach collection="saAggParam.dosageName" item="name" open="(" separator="," close=")">-->
+<!--                    #{name}-->
+<!--                </foreach>-->
+<!--            </if>-->
+<!--            <if test="saAggParam.goodsName != null  and saAggParam.goodsName != ''"> and current_month.goods_name in-->
+<!--                <foreach collection="saAggParam.goodsName" item="name" open="(" separator="," close=")">-->
+<!--                    #{name}-->
+<!--                </foreach>-->
+<!--            </if>-->
+<!--            <if test="saAggParam.provinceName != null  and saAggParam.provinceName != ''"> and current_month.province_name in-->
+<!--                <foreach collection="saAggParam.provinceName" item="name" open="(" separator="," close=")">-->
+<!--                    #{name}-->
+<!--                </foreach>-->
+<!--            </if>-->
+<!--            <if test="saAggParam.salerName != null  and saAggParam.salerName != ''"> and current_month.saler_name in-->
+<!--                <foreach collection="saAggParam.salerName" item="name" open="(" separator="," close=")">-->
+<!--                    #{name}-->
+<!--                </foreach>-->
+<!--            </if>-->
 
-            <if test="saAggParam.stdGoodsName != null  and saAggParam.stdGoodsName != ''"> and current_month.std_goods_name in
-                <foreach collection="saAggParam.stdGoodsName" item="name" open="(" separator="," close=")">
-                    #{name}
-                </foreach>
-            </if>
-        </where>
+<!--            <if test="saAggParam.stdGoodsName != null  and saAggParam.stdGoodsName != ''"> and current_month.std_goods_name in-->
+<!--                <foreach collection="saAggParam.stdGoodsName" item="name" open="(" separator="," close=")">-->
+<!--                    #{name}-->
+<!--                </foreach>-->
+<!--            </if>-->
+<!--        </where>-->
     </select>
 
 
@@ -638,31 +638,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LPAD(current_month.use_month, 2, '0') as ny,
             </otherwise>
         </choose>
-        <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+        <if test="groupFieldList.contains('customName')">
             current_month.custom_id,
             current_month.custom_name,
         </if>
-        <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+        <if test="groupFieldList.contains('zoneName')">
             current_month.zone_id,
             current_month.zone_name,
         </if>
-        <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+        <if test="groupFieldList.contains('saleTypeName')">
             current_month.sale_type_id,
             current_month.sale_type_name,
         </if>
-        <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+        <if test="groupFieldList.contains('salerName')">
             current_month.saler_id,
             current_month.saler_name,
         </if>
-        <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+        <if test="groupFieldList.contains('dosageName')">
             current_month.dosage_id,
             current_month.dosage_name,
         </if>
-        <if test="groupFieldList.contains('effectName') || params.containsKey('effectName')">
+        <if test="groupFieldList.contains('effectName')">
             current_month.effect_id,
             current_month.effect_name,
         </if>
-        <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+        <if test="groupFieldList.contains('stdGoodsName')">
             current_month.std_goods_name,
         </if>
         current_month.this_month_sa_qty AS this_month_sa_qty,
@@ -739,32 +739,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             use_year,
         </if>
         use_month,
-        <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+        <if test="groupFieldList.contains('customName')">
             custom_id,
             custom_name ,
         </if>
 
-        <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+        <if test="groupFieldList.contains('stdGoodsName')">
             std_goods_name,
         </if>
 
-        <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+        <if test="groupFieldList.contains('zoneName')">
             zone_id,
             zone_name,
         </if>
-        <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+        <if test="groupFieldList.contains('saleTypeName')">
             sale_type_id,
             sale_type_name,
         </if>
-        <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+        <if test="groupFieldList.contains('dosageName')">
             dosage_id,
             dosage_name,
         </if>
-        <if test="groupFieldList.contains('effectName') || params.containsKey('effectName')">
+        <if test="groupFieldList.contains('effectName')">
             effect_id,
             effect_name,
         </if>
-        <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+        <if test="groupFieldList.contains('salerName')">
             saler_id,
             saler_name,
         </if>
@@ -839,30 +839,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 use_year,
             </if>
             use_month,
-            <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+            <if test="groupFieldList.contains('customName')">
                 custom_id,
                 custom_name ,
             </if>
-            <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+            <if test="groupFieldList.contains('stdGoodsName')">
                 std_goods_name,
             </if>
-            <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+            <if test="groupFieldList.contains('zoneName')">
                 zone_id,
                 zone_name,
             </if>
-            <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+            <if test="groupFieldList.contains('saleTypeName')">
                 sale_type_id,
                 sale_type_name,
             </if>
-            <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+            <if test="groupFieldList.contains('dosageName')">
                 dosage_id,
                 dosage_name,
             </if>
-            <if test="groupFieldList.contains('effectName') || params.containsKey('effectName')">
+            <if test="groupFieldList.contains('effectName')">
                 effect_id,
                 effect_name,
             </if>
-            <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+            <if test="groupFieldList.contains('salerName')">
                 saler_id,
                 saler_name,
             </if>
@@ -874,25 +874,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             use_year,
         </if>
         use_month,
-        <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+        <if test="groupFieldList.contains('customName')">
             custom_id,
         </if>
-        <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+        <if test="groupFieldList.contains('stdGoodsName')">
             std_goods_name,
         </if>
-        <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+        <if test="groupFieldList.contains('zoneName')">
             zone_id,
         </if>
-        <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+        <if test="groupFieldList.contains('saleTypeName')">
             sale_type_id,
         </if>
-        <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+        <if test="groupFieldList.contains('dosageName')">
             dosage_id,
         </if>
-        <if test="groupFieldList.contains('effectName') || params.containsKey('effectName')">
+        <if test="groupFieldList.contains('effectName')">
             effect_id,
         </if>
-        <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+        <if test="groupFieldList.contains('salerName')">
             saler_id,
         </if>
         ifnull(SUM(this_month_sa_qty), 0) AS last_month_sa_qty,
@@ -906,25 +906,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 use_year,
             </if>
             use_month,
-            <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+            <if test="groupFieldList.contains('customName')">
                 custom_id,
             </if>
-            <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+            <if test="groupFieldList.contains('stdGoodsName')">
                 std_goods_name,
             </if>
-            <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+            <if test="groupFieldList.contains('zoneName')">
                 zone_id,
             </if>
-            <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+            <if test="groupFieldList.contains('saleTypeName')">
                 sale_type_id,
             </if>
-            <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+            <if test="groupFieldList.contains('dosageName')">
                 dosage_id,
             </if>
-            <if test="groupFieldList.contains('effectName') || params.containsKey('effectName')">
+            <if test="groupFieldList.contains('effectName')">
                 effect_id,
             </if>
-            <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+            <if test="groupFieldList.contains('salerName')">
                 saler_id,
             </if>
         </trim>
@@ -933,25 +933,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="groupFieldList.contains('useYear')  || params.containsKey('useYearStart')|| params.containsKey('useYearEnd')">
             AND last_month_data.use_year = current_month.use_year - (current_month.use_month = 1)
         </if>
-        <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+        <if test="groupFieldList.contains('customName')">
             AND current_month.custom_id = last_month_data.custom_id
         </if>
-        <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+        <if test="groupFieldList.contains('stdGoodsName')">
             AND current_month.std_goods_name = last_month_data.std_goods_name
         </if>
-        <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+        <if test="groupFieldList.contains('zoneName')">
             AND current_month.zone_id = last_month_data.zone_id
         </if>
-        <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+        <if test="groupFieldList.contains('saleTypeName')">
             AND current_month.sale_type_id = last_month_data.sale_type_id
         </if>
-        <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+        <if test="groupFieldList.contains('dosageName')">
             AND current_month.dosage_id = last_month_data.dosage_id
         </if>
-        <if test="groupFieldList.contains('effectName') || params.containsKey('effectName')">
+        <if test="groupFieldList.contains('effectName')">
             AND current_month.effect_id = last_month_data.effect_id
         </if>
-        <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+        <if test="groupFieldList.contains('salerName')">
             AND current_month.saler_id = last_month_data.saler_id
         </if>
         LEFT JOIN (
@@ -960,25 +960,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             use_year,
         </if>
         use_month,
-        <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+        <if test="groupFieldList.contains('customName')">
             custom_id,
         </if>
-        <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+        <if test="groupFieldList.contains('stdGoodsName')">
             std_goods_name,
         </if>
-        <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+        <if test="groupFieldList.contains('zoneName')">
             zone_id,
         </if>
-        <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+        <if test="groupFieldList.contains('saleTypeName')">
             sale_type_id,
         </if>
-        <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+        <if test="groupFieldList.contains('dosageName')">
             dosage_id,
         </if>
-        <if test="groupFieldList.contains('effectName') || params.containsKey('effectName')">
+        <if test="groupFieldList.contains('effectName')">
             effect_id,
         </if>
-        <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+        <if test="groupFieldList.contains('salerName')">
             saler_id,
         </if>
         ifnull(SUM(this_month_sa_qty), 0) AS yoy_month_sa_qty,
@@ -1042,25 +1042,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 use_year,
             </if>
             use_month,
-            <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+            <if test="groupFieldList.contains('customName')">
                 custom_id,
             </if>
-            <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+            <if test="groupFieldList.contains('stdGoodsName')">
                 std_goods_name,
             </if>
-            <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+            <if test="groupFieldList.contains('zoneName')">
                 zone_id,
             </if>
-            <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+            <if test="groupFieldList.contains('saleTypeName')">
                 sale_type_id,
             </if>
-            <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+            <if test="groupFieldList.contains('dosageName')">
                 dosage_id,
             </if>
-            <if test="groupFieldList.contains('effectName') || params.containsKey('effectName')">
+            <if test="groupFieldList.contains('effectName')">
                 effect_id,
             </if>
-            <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+            <if test="groupFieldList.contains('salerName')">
                 saler_id,
             </if>
         </trim>
@@ -1071,25 +1071,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and yoy_month.use_year = current_month.use_year - 1
             </if>
             and yoy_month.use_month = current_month.use_month
-            <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+            <if test="groupFieldList.contains('customName')">
                 AND yoy_month.custom_id = current_month.custom_id
             </if>
-            <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+            <if test="groupFieldList.contains('stdGoodsName')">
                 AND yoy_month.std_goods_name = current_month.std_goods_name
             </if>
-            <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+            <if test="groupFieldList.contains('zoneName')">
                 AND yoy_month.zone_id = current_month.zone_id
             </if>
-            <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+            <if test="groupFieldList.contains('saleTypeName')">
                 AND yoy_month.sale_type_id = current_month.sale_type_id
             </if>
-            <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+            <if test="groupFieldList.contains('dosageName')">
                 AND yoy_month.dosage_id = current_month.dosage_id
             </if>
-            <if test="groupFieldList.contains('effectName') || params.containsKey('effectName')">
+            <if test="groupFieldList.contains('effectName')">
                 AND yoy_month.effect_id = current_month.effect_id
             </if>
-            <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+            <if test="groupFieldList.contains('salerName')">
                 AND yoy_month.saler_id = current_month.saler_id
             </if>
         </trim>
@@ -1103,60 +1103,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY
         use_year
         ) total_month_data ON total_month_data.use_year = current_month.use_year
-        <where>
-            <if test="saAggParam.useYearStart != null and saAggParam.useYearStart != '' and saAggParam.useMonthStart != null and saAggParam.useMonthStart != ''">
-                AND (current_month.use_year * 100 + current_month.use_month) &gt;= (#{saAggParam.useYearStart} * 100 + #{saAggParam.useMonthStart})
-            </if>
-            <if test="saAggParam.useYearEnd != null and saAggParam.useYearEnd != '' and saAggParam.useMonthEnd != null and saAggParam.useMonthEnd != ''">
-                AND (current_month.use_year * 100 + current_month.use_month) &lt;= (#{saAggParam.useYearEnd} * 100 + #{saAggParam.useMonthEnd})
-            </if>
-            <if test="saAggParam.zoneName != null  and saAggParam.zoneName != ''"> and current_month.zone_name in
-                <foreach collection="saAggParam.zoneName" item="name" open="(" separator="," close=")">
-                    #{name}
-                </foreach>
-            </if>
-            <if test="saAggParam.saleTypeName != null  and saAggParam.saleTypeName != ''"> and current_month.sale_type_name in
-                <foreach collection="saAggParam.saleTypeName" item="name" open="(" separator="," close=")">
-                    #{name}
-                </foreach>
-            </if>
-            <if test="saAggParam.customName != null  and saAggParam.customName != ''"> and current_month.custom_name in
-                <foreach collection="saAggParam.customName" item="name" open="(" separator="," close=")">
-                    #{name}
-                </foreach>
-            </if>
-            <if test="saAggParam.dosageName != null  and saAggParam.dosageName != ''"> and current_month.dosage_name in
-                <foreach collection="saAggParam.dosageName" item="name" open="(" separator="," close=")">
-                    #{name}
-                </foreach>
-            </if>
-            <if test="saAggParam.effectName != null  and saAggParam.effectName != ''"> and current_month.effect_name in
-                <foreach collection="saAggParam.effectName" item="name" open="(" separator="," close=")">
-                    #{name}
-                </foreach>
-            </if>
-            <if test="saAggParam.goodsName != null  and saAggParam.goodsName != ''"> and current_month.goods_name in
-                <foreach collection="saAggParam.goodsName" item="name" open="(" separator="," close=")">
-                    #{name}
-                </foreach>
-            </if>
-            <if test="saAggParam.provinceName != null  and saAggParam.provinceName != ''"> and current_month.province_name in
-                <foreach collection="saAggParam.provinceName" item="name" open="(" separator="," close=")">
-                    #{name}
-                </foreach>
-            </if>
-            <if test="saAggParam.salerName != null  and saAggParam.salerName != ''"> and current_month.saler_name in
-                <foreach collection="saAggParam.salerName" item="name" open="(" separator="," close=")">
-                    #{name}
-                </foreach>
-            </if>
+<!--        <where>-->
+<!--            <if test="saAggParam.useYearStart != null and saAggParam.useYearStart != '' and saAggParam.useMonthStart != null and saAggParam.useMonthStart != ''">-->
+<!--                AND (current_month.use_year * 100 + current_month.use_month) &gt;= (#{saAggParam.useYearStart} * 100 + #{saAggParam.useMonthStart})-->
+<!--            </if>-->
+<!--            <if test="saAggParam.useYearEnd != null and saAggParam.useYearEnd != '' and saAggParam.useMonthEnd != null and saAggParam.useMonthEnd != ''">-->
+<!--                AND (current_month.use_year * 100 + current_month.use_month) &lt;= (#{saAggParam.useYearEnd} * 100 + #{saAggParam.useMonthEnd})-->
+<!--            </if>-->
+<!--            <if test="groupFieldList.contains('zoneName') and saAggParam.zoneName != null  and saAggParam.zoneName != ''"> and current_month.zone_name in-->
+<!--                <foreach collection="saAggParam.zoneName" item="name" open="(" separator="," close=")">-->
+<!--                    #{name}-->
+<!--                </foreach>-->
+<!--            </if>-->
+<!--            <if test="groupFieldList.contains('saleTypeName') and saAggParam.saleTypeName != null  and saAggParam.saleTypeName != ''"> and current_month.sale_type_name in-->
+<!--                <foreach collection="saAggParam.saleTypeName" item="name" open="(" separator="," close=")">-->
+<!--                    #{name}-->
+<!--                </foreach>-->
+<!--            </if>-->
+<!--            <if test="groupFieldList.contains('customName') and saAggParam.customName != null  and saAggParam.customName != ''"> and current_month.custom_name in-->
+<!--                <foreach collection="saAggParam.customName" item="name" open="(" separator="," close=")">-->
+<!--                    #{name}-->
+<!--                </foreach>-->
+<!--            </if>-->
+<!--            <if test="groupFieldList.contains('dosageName') and saAggParam.dosageName != null  and saAggParam.dosageName != ''"> and current_month.dosage_name in-->
+<!--                <foreach collection="saAggParam.dosageName" item="name" open="(" separator="," close=")">-->
+<!--                    #{name}-->
+<!--                </foreach>-->
+<!--            </if>-->
+<!--            <if test="groupFieldList.contains('effectName') and saAggParam.effectName != null  and saAggParam.effectName != ''"> and current_month.effect_name in-->
+<!--                <foreach collection="saAggParam.effectName" item="name" open="(" separator="," close=")">-->
+<!--                    #{name}-->
+<!--                </foreach>-->
+<!--            </if>-->
+<!--            <if test="groupFieldList.contains('goodsName') and saAggParam.goodsName != null  and saAggParam.goodsName != ''"> and current_month.goods_name in-->
+<!--                <foreach collection="saAggParam.goodsName" item="name" open="(" separator="," close=")">-->
+<!--                    #{name}-->
+<!--                </foreach>-->
+<!--            </if>-->
+<!--            <if test="groupFieldList.contains('provinceName') and saAggParam.provinceName != null  and saAggParam.provinceName != ''"> and current_month.province_name in-->
+<!--                <foreach collection="saAggParam.provinceName" item="name" open="(" separator="," close=")">-->
+<!--                    #{name}-->
+<!--                </foreach>-->
+<!--            </if>-->
+<!--            <if test="groupFieldList.contains('salerName') and saAggParam.salerName != null  and saAggParam.salerName != ''"> and current_month.saler_name in-->
+<!--                <foreach collection="saAggParam.salerName" item="name" open="(" separator="," close=")">-->
+<!--                    #{name}-->
+<!--                </foreach>-->
+<!--            </if>-->
 
-            <if test="saAggParam.stdGoodsName != null  and saAggParam.stdGoodsName != ''"> and current_month.std_goods_name in
-                <foreach collection="saAggParam.stdGoodsName" item="name" open="(" separator="," close=")">
-                    #{name}
-                </foreach>
-            </if>
-        </where>
+<!--            <if test="groupFieldList.contains('stdGoodsName') and saAggParam.stdGoodsName != null  and saAggParam.stdGoodsName != ''"> and current_month.std_goods_name in-->
+<!--                <foreach collection="saAggParam.stdGoodsName" item="name" open="(" separator="," close=")">-->
+<!--                    #{name}-->
+<!--                </foreach>-->
+<!--            </if>-->
+<!--        </where>-->
     </select>
 
 
@@ -1182,7 +1182,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ROUND(SUM(this_month_sa_money), 2) AS year_sa_money
     FROM
         new_gr_bi_sa_agg_month_count a
-            LEFT JOIN gr_contacts c ON a.saler_name = c.`name`
+            LEFT JOIN gr_report.gr_contacts c ON a.saler_name = c.`name`
             AND a.zone_name = c.zone
     WHERE
         use_year = YEAR(CURDATE())
@@ -1223,7 +1223,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 ROUND(SUM(this_month_sa_money), 2) AS year_sa_money
             FROM
                 new_gr_bi_sa_agg a
-                    LEFT JOIN gr_googs_proxy p ON a.goods_id = p.goods_id
+                    LEFT JOIN gr_report.gr_googs_proxy p ON a.goods_id = p.goods_id
             WHERE
                 use_year = YEAR(CURDATE())
               AND sale_type_name = '代理品种'
diff --git a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggYearCountMapper.xml b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggYearCountMapper.xml
index 42e4c6d..e07fb5c 100644
--- a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggYearCountMapper.xml
+++ b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggYearCountMapper.xml
@@ -249,31 +249,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="groupFieldList.contains('useYear')  || params.containsKey('useYearStart') || params.containsKey('useYearEnd')">
                 current_year_data.ny as ny,
         </if>
-        <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+        <if test="groupFieldList.contains('customName')">
             current_year_data.custom_id,
             current_year_data.custom_name,
         </if>
-        <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+        <if test="groupFieldList.contains('zoneName')">
             current_year_data.zone_id,
             current_year_data.zone_name,
         </if>
-        <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+        <if test="groupFieldList.contains('saleTypeName')">
             current_year_data.sale_type_id,
             current_year_data.sale_type_name,
         </if>
-        <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+        <if test="groupFieldList.contains('salerName')">
             current_year_data.saler_id,
             current_year_data.saler_name,
         </if>
-        <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+        <if test="groupFieldList.contains('dosageName')">
             current_year_data.dosage_id,
             current_year_data.dosage_name,
         </if>
-        <if test="groupFieldList.contains('effectName') || params.containsKey('effectName')">
+        <if test="groupFieldList.contains('effectName')">
             current_year_data.effect_id,
             current_year_data.effect_name,
         </if>
-        <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+        <if test="groupFieldList.contains('stdGoodsName')">
             current_year_data.std_goods_name,
         </if>
 
@@ -335,30 +335,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          FROM
              (SELECT use_year ,
             use_year AS ny,
-            <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+            <if test="groupFieldList.contains('customName')">
                 custom_id,
                 custom_name ,
             </if>
-            <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+            <if test="groupFieldList.contains('stdGoodsName')">
                 std_goods_name,
             </if>
-            <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+            <if test="groupFieldList.contains('zoneName')">
                 zone_id,
                 zone_name,
             </if>
-            <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+            <if test="groupFieldList.contains('saleTypeName')">
                 sale_type_id,
                 sale_type_name,
             </if>
-            <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+            <if test="groupFieldList.contains('dosageName')">
                 dosage_id,
                 dosage_name,
             </if>
-            <if test="groupFieldList.contains('effectName') || params.containsKey('effectName')">
+            <if test="groupFieldList.contains('effectName')">
                 effect_id,
                 effect_name,
             </if>
-            <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+            <if test="groupFieldList.contains('salerName')">
                 saler_id,
                 saler_name,
             </if>
@@ -423,30 +423,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             GROUP BY
             <trim suffixOverrides=",">
                 use_year,
-                <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+                <if test="groupFieldList.contains('customName')">
                     custom_id,
                     custom_name ,
                 </if>
-                <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+                <if test="groupFieldList.contains('stdGoodsName')">
                     std_goods_name,
                 </if>
-                <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+                <if test="groupFieldList.contains('zoneName')">
                     zone_id,
                     zone_name,
                 </if>
-                <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+                <if test="groupFieldList.contains('saleTypeName')">
                     sale_type_id,
                     sale_type_name,
                 </if>
-                <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+                <if test="groupFieldList.contains('dosageName')">
                     dosage_id,
                     dosage_name,
                 </if>
-                <if test="groupFieldList.contains('effectName') || params.containsKey('effectName')">
+                <if test="groupFieldList.contains('effectName')">
                     effect_id,
                     effect_name,
                 </if>
-                <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+                <if test="groupFieldList.contains('salerName')">
                     saler_id,
                     saler_name,
                 </if>
@@ -454,25 +454,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
             )  as current_year_data
          LEFT JOIN (SELECT use_year,
-                <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+                <if test="groupFieldList.contains('customName')">
                     custom_id,
                 </if>
-                <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+                <if test="groupFieldList.contains('stdGoodsName')">
                     std_goods_name,
                 </if>
-                <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+                <if test="groupFieldList.contains('zoneName')">
                     zone_id,
                 </if>
-                <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+                <if test="groupFieldList.contains('saleTypeName')">
                     sale_type_id,
                 </if>
-                <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+                <if test="groupFieldList.contains('dosageName')">
                     dosage_id,
                 </if>
-                <if test="groupFieldList.contains('effectName') || params.containsKey('effectName')">
+                <if test="groupFieldList.contains('effectName')">
                     effect_id,
                 </if>
-                <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+                <if test="groupFieldList.contains('salerName')">
                     saler_id,
                 </if>
                  ifnull(SUM(this_year_sa_qty), 0)   AS last_year_sa_qty,
@@ -533,50 +533,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             GROUP BY
                 <trim suffixOverrides=",">
                     use_year,
-                    <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+                    <if test="groupFieldList.contains('customName')">
                         custom_id,
                     </if>
-                    <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+                    <if test="groupFieldList.contains('stdGoodsName')">
                         std_goods_name,
                     </if>
-                    <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+                    <if test="groupFieldList.contains('zoneName')">
                         zone_id,
                     </if>
-                    <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+                    <if test="groupFieldList.contains('saleTypeName')">
                         sale_type_id,
                     </if>
-                    <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+                    <if test="groupFieldList.contains('dosageName')">
                         dosage_id,
                     </if>
-                    <if test="groupFieldList.contains('effectName') || params.containsKey('effectName')">
+                    <if test="groupFieldList.contains('effectName')">
                         effect_id,
                     </if>
-                    <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+                    <if test="groupFieldList.contains('salerName')">
                         saler_id,
                     </if>
                 </trim>
 
                  ) AS last_year_data
                ON last_year_data.use_year = current_year_data.use_year - 1
-                <if test="groupFieldList.contains('customName') || params.containsKey('customName')">
+                <if test="groupFieldList.contains('customName')">
                        AND current_year_data.custom_id = last_year_data.custom_id
                 </if>
-                <if test="groupFieldList.contains('stdGoodsName') || params.containsKey('stdGoodsName')">
+                <if test="groupFieldList.contains('stdGoodsName')">
                        AND current_year_data.std_goods_name = last_year_data.std_goods_name
                 </if>
-                <if test="groupFieldList.contains('zoneName') || params.containsKey('zoneName')">
+                <if test="groupFieldList.contains('zoneName')">
                        AND current_year_data.zone_id = last_year_data.zone_id
                 </if>
-                <if test="groupFieldList.contains('saleTypeName') || params.containsKey('saleTypeName')">
+                <if test="groupFieldList.contains('saleTypeName')">
                        AND current_year_data.sale_type_id = last_year_data.sale_type_id
                 </if>
-                <if test="groupFieldList.contains('dosageName') || params.containsKey('dosageName')">
+                <if test="groupFieldList.contains('dosageName')">
                        AND current_year_data.dosage_id = last_year_data.dosage_id
                 </if>
-                <if test="groupFieldList.contains('effectName') || params.containsKey('effectName')">
+                <if test="groupFieldList.contains('effectName')">
                        AND current_year_data.effect_id = last_year_data.effect_id
                 </if>
-                <if test="groupFieldList.contains('salerName') || params.containsKey('salerName')">
+                <if test="groupFieldList.contains('salerName')">
                        AND current_year_data.saler_id = last_year_data.saler_id
                 </if>
          LEFT JOIN (SELECT use_year,