Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
===================================================================
diff -u -r20103 -r20495
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java	(.../InvoicePlanAction.java)	(revision 20103)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java	(.../InvoicePlanAction.java)	(revision 20495)
@@ -42,7 +42,6 @@
 import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoiceItem;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
-import com.forgon.disinfectsystem.entity.invoicemanager.TimeQuantum;
 import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyDisinfection;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyItem;
@@ -55,7 +54,6 @@
 import com.forgon.serialnumber.service.SerialNumManager;
 import com.forgon.systemsetting.model.HttpOption;
 import com.forgon.systemsetting.service.HttpOptionManager;
-import com.forgon.tools.Constants;
 import com.forgon.tools.StrutsParamUtils;
 import com.forgon.tools.StrutsResponseUtils;
 import com.forgon.tools.db.DatabaseUtil;
@@ -374,7 +372,7 @@
 		String tousseType = StrutsParamUtils.getPraramValue("tousseType", "");
 		
 		Collection<InvoicePlanVo> vos = invoicePlanManager
-				.getDepartInvoicePlan(Arrays.asList(departCodes),applyDate ,tousseType , TimeQuantum.All);
+				.getDepartInvoicePlan(Arrays.asList(departCodes),applyDate ,tousseType);
 
         vos = invoicePlanManager.filterQueryByPara(vos);
 
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r20253 -r20495
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 20253)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 20495)
@@ -220,12 +220,11 @@
 	 * @param departCodes 科室分组,如9002195;9002197;9002196;9002189
 	 * @param applyDate 开始与结束日期,如2015-09-22;2015-09-22
 	 * @param tousseType 物品类型,如是或否,是代码为一次性物品,否代码非一次性物品
-	 * @param timeQuantum
 	 * @return
 	 */
 	@Override
 	public Collection<InvoicePlanVo> getDepartInvoicePlan(
-			Collection<String> departCodes, String applyDate, String tousseType, TimeQuantum timeQuantum) {
+			Collection<String> departCodes, String applyDate, String tousseType) {
 		boolean hideUnprintedDisposableGoodsInvoicePlan = CssdUtils.getSystemSetConfigByNameBool("hideUnprintedDisposableGoodsInvoicePlan");
 		//查询发货计划
 		Collection<InvoicePlan> invoicePlans = getInvoicePlanListByOrgUnitCodingsAndTousseType(
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
===================================================================
diff -u -r20253 -r20495
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 20253)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 20495)
@@ -40,7 +40,7 @@
 	 * @param timeQuantum
 	 * @return
 	 */
-	public Collection<InvoicePlanVo> getDepartInvoicePlan(Collection<String> departCodes, String applyDate, String tousseType, TimeQuantum timeQuantum);
+	public Collection<InvoicePlanVo> getDepartInvoicePlan(Collection<String> departCodes, String applyDate, String tousseType);
 	
 	/**
 	 * 按条件查询科室的待发货以及部分发货的发货计划单,不进行分组统计
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoicePlanManagerTest.java
===================================================================
diff -u -r20054 -r20495
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoicePlanManagerTest.java	(.../InvoicePlanManagerTest.java)	(revision 20054)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoicePlanManagerTest.java	(.../InvoicePlanManagerTest.java)	(revision 20495)
@@ -23,7 +23,6 @@
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
-import com.forgon.disinfectsystem.entity.invoicemanager.TimeQuantum;
 import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication;
 import com.forgon.disinfectsystem.entity.tousseitem.TousseItem;
 import com.forgon.disinfectsystem.recyclingapplication.vo.ApplicationGoodsVo;
@@ -1040,7 +1039,7 @@
         		List<String> departCodes = new LinkedList<String>();
         		departCodes.add("3266");
         		Collection<InvoicePlanVo> vos = invoicePlanManager
-        				.getDepartInvoicePlan(departCodes,null ,null , TimeQuantum.All);
+        				.getDepartInvoicePlan(departCodes,null ,null);
                 assertEquals(vos.size(), 0);
         	}
         }
@@ -1326,19 +1325,19 @@
         	{
         		List<String> departCodes = new LinkedList<String>();
         		Collection<InvoicePlanVo> vos = invoicePlanManager
-        				.getDepartInvoicePlan(departCodes,null ,null, TimeQuantum.All);
+        				.getDepartInvoicePlan(departCodes,null ,null);
                 assertEquals(vos.size(), 3);
         	}
         	{
         		List<String> departCodes = new LinkedList<String>();
         		Collection<InvoicePlanVo> vos = invoicePlanManager
-        				.getDepartInvoicePlan(departCodes,null ,"一次性物品" , TimeQuantum.All);
+        				.getDepartInvoicePlan(departCodes,null ,"一次性物品");
                 assertEquals(vos.size(), 2);
         	}
         	{
         		List<String> departCodes = new LinkedList<String>();
         		Collection<InvoicePlanVo> vos = invoicePlanManager
-        				.getDepartInvoicePlan(departCodes,null ,"普通器械包" , TimeQuantum.All);
+        				.getDepartInvoicePlan(departCodes,null ,"普通器械包");
                 assertEquals(vos.size(), 2);
         	}
         }
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r20477 -r20495
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 20477)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 20495)
@@ -77,7 +77,6 @@
 import com.forgon.disinfectsystem.entity.idcardinstance.IDCardInstance;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoiceDepartment;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
-import com.forgon.disinfectsystem.entity.invoicemanager.TimeQuantum;
 import com.forgon.disinfectsystem.entity.operationreservation.OperationReservation;
 import com.forgon.disinfectsystem.entity.packing.ReviewedBasket;
 import com.forgon.disinfectsystem.entity.printRecyclingApplicationConfig.PrintConfig;
@@ -1030,7 +1029,7 @@
 		String tousseType = params.optString("tousseType" , null);
 		
 		Collection<InvoicePlanVo> vos = invoicePlanManager
-				.getDepartInvoicePlan(departCodes,applyDate ,tousseType, TimeQuantum.All);
+				.getDepartInvoicePlan(departCodes,applyDate ,tousseType);
 		JSONArray jsonArray = JSONArray.fromObject(vos);
 		return new JSONStringer().object().key("success").value(true)
 				.key("invoicePlans").value(jsonArray).endObject().toString();