diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisNotCalcAgingMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisNotCalcAgingMapper.java
index fdcd1c70d..20ab234ee 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisNotCalcAgingMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisNotCalcAgingMapper.java
@@ -72,5 +72,5 @@ public interface EmisNotCalcAgingMapper extends BaseMapper<EmisNotCalcAging>
     public int deleteEmisNotCalcAgingByIds(Long[] ids);
 
 
-    public int getNotCalcAgingDays(@Param("recieveCountry") String destCountry,@Param("sendCountry") String sendCountry, @Param("startDate") Date startDate, @Param("startDate") Date endDate );
+    public int getNotCalcAgingDays(@Param("recieveCountry") String recieveCountry,@Param("sendCountry") String sendCountry, @Param("startDate") Date startDate, @Param("endDate") Date endDate );
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 6bd54b3c6..2c75c9f3d 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -237,17 +237,18 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             emisWaybillSave.setOrderSn(orderSn);
 
             // 登记网点
-            emisWaybillSave.setRegisterSiteCode(emisWaybillSave.getCreateSite());
-            emisWaybillSave.setRegisterManCode(SecurityUtils.getLoginUser().getUser().getEmpCode());
+            emisWaybillSave.setRegisterSiteCode(getCurrentUser().getOwnerSiteCode());
+            emisWaybillSave.setRegisterManCode(getCurrentUser().getEmpCode());
 
             // 发件网点
-            emisWaybillSave.setSendSiteCode(emisWaybillSave.getCreateSite());
-            emisWaybillSave.setSendSiteName(SecurityUtils.getLoginUser().getUser().getOwnerSiteName());
+            emisWaybillSave.setSendSiteCode(getCurrentUser().getOwnerSiteCode());
+            emisWaybillSave.setSendSiteName(getCurrentUser().getOwnerSiteName());
 
-            // 目的网点
+            // 派件网点
             emisWaybillSave.setDispatchSiteCode(emisWaybillSave.getDispatchUnderlingSiteCode());
 
 
+            // 订单运单初始状态
             emisWaybillSave.setOrderStatus("0");
             emisWaybillSave.setWaybillStatus("0");