diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
index 3f252e233..4a6a98dfc 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
@@ -254,7 +254,7 @@ public class WaybillHelper {
     }
 
     public static JSONObject parseChinaAddress(String content) throws EmisBizError {
-        String url = "http://api2.xdadan.com/api/qcdata/query/express/parseChinaAddress";
+        String url = "http://api.ai.xdadan.com/api/qcdata/query/express/parseChinaAddress";
         Map postData = new HashMap();
         postData.put("content", content);
         postData.put("appID", "tanex");
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
index 38bc7b1e5..95556e2e5 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
@@ -1102,7 +1102,13 @@
             </where>
             GROUP BY a.settle_bill_no
             ) tbc ON tba.settle_bill_no = tbc.settle_bill_no
-        ) tbMA left join emis_commission_profit ecp on tbMA.salesmen=ecp.emp_name and tbMA.billMonth = ecp.bill_month
+        ) tbMA left join (
+            SELECT emp_name, bill_month,
+                   max(money) as money,
+                   max(month_money) as month_money
+            FROM emis_commission_profit
+            GROUP BY emp_name, bill_month
+        ) ecp on tbMA.salesmen=ecp.emp_name and tbMA.billMonth = ecp.bill_month
         group by tbMA.salesmen,tbMA.billMonth
     </select>