Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r16441 -r16445 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 16441) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 16445) @@ -124,6 +124,7 @@ import com.forgon.tools.GB2WB; import com.forgon.tools.MathTools; import com.forgon.tools.SqlBuilder; +import com.forgon.tools.StrutsParamUtils; import com.forgon.tools.date.DateTools; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.db.InitDbConnection; @@ -7759,6 +7760,8 @@ } public JSONArray getTousseInstancesForAuxiliaryInvoice(JSONObject params) { + String applyDate = StrutsParamUtils.getPraramValue("applyDate", ""); + String tousseType = StrutsParamUtils.getPraramValue("tousseType", ""); JSONArray jsonArray = new JSONArray(); SupplyRoomConfig config = supplyRoomConfigManager.getSystemParamsObj(); String invoiceOrigin = config.getInvoiceOrigin(); @@ -7776,7 +7779,7 @@ Map tousseDefinitionInfoMap = new HashMap(); List invoicePlanList = invoicePlanManager .getInvoicePlanListByOrgUnitCodingsAndTousseType( - Arrays.asList(departCode), null, "普通器械包,外来器械包"); + Arrays.asList(departCode), applyDate, "普通器械包,外来器械包"); if (invoicePlanList != null) { for (InvoicePlan invoicePlan : invoicePlanList) { if(invoicePlan instanceof ForeignTousseApplication){