Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r21251 -r21450
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 21251)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 21450)
@@ -1045,10 +1045,10 @@
 		
 		//申请日期与物品类型
 		String applyDate = params.optString("applyDate" , null);
-		//String tousseType = params.optString("tousseType" , TousseDefinition.PACKAGE_TYPE_INSIDE);
+		String tousseType = params.optString("tousseType" , TousseDefinition.PACKAGE_TYPE_INSIDE);
 		
 		Collection<ExpressInvoiceInvoicePlanVo> vos = invoicePlanManager
-				.getExpressInvoiceInvoiePlans(departCodes,applyDate ,TousseDefinition.PACKAGE_TYPE_INSIDE);
+				.getExpressInvoiceInvoiePlans(departCodes,applyDate ,tousseType);
 		JSONArray jsonArray = JSONArray.fromObject(vos);
 		return JSONUtil.buildJsonObject(true, jsonArray).toString();
 	}
@@ -1213,6 +1213,8 @@
 					continue;
 				}
 				
+				String tousseType = JSONUtil.optString(params, "tousseType", TousseDefinition.PACKAGE_TYPE_INSIDE);
+				
 				JSONObject param = new JSONObject();
 				param.put("mode", "depart");
 				param.put("departCode", item.getDepartCoding());
@@ -1221,7 +1223,7 @@
 				param.put("personInCharge", JSONUtil.optString(params, "personInCharge", ""));
 				param.put("personInChargeCode", JSONUtil.optString(params, "personInChargeCode", ""));
 				param.put("applyDate", JSONUtil.optString(params, "applyDate", ""));
-				param.put("tousseType", JSONUtil.optString(params, "tousseType", ""));
+				param.put("tousseType", tousseType);
 				param.put("sourceWarehouseId", JSONUtil.optLong(params, "sourceWarehouseId", null));
 				param.put("sourceWarehouseName", JSONUtil.optString(params, "sourceWarehouseName", ""));
 				
@@ -1230,8 +1232,10 @@
 				JSONObject invoiceItem = new JSONObject();
 				invoiceItem.put("barcode", JSONUtil.optString(params, "scanedBarcode", ""));
 				invoiceItem.put("sendAmount", scanedAmount);
-				invoiceItem.put("tousseType", TousseDefinition.PACKAGE_TYPE_INSIDE);
+				invoiceItem.put("tousseType", tousseType);
 				invoiceItem.put("isRoutine", JSONUtil.optString(params, "isRoutine", ""));
+				invoiceItem.put("diposable", TousseDefinition.PACKAGE_TYPE_INSIDE.equals(tousseType)?TousseItem.DIPOSABLE_NO:TousseItem.DIPOSABLE_YES);
+				invoiceItem.put("typeInfoOnScanned", JSONUtil.optString(params, "typeInfoOnScanned", ""));
 				invoiceItems.add(invoiceItem);
 				param.put("invoiceItems", invoiceItems);
 				paramsArray.add(param);
@@ -2711,7 +2715,7 @@
 		
 		return applyDateMapList;
 	}
-	public JSONArray getInvoicePlanListTousseTypeArray(){
+	public JSONArray getInvoicePlanListTousseTypeArray(boolean expressInvoice){
 		String tousseTypeArrayStr = CssdUtils.getSystemSetConfigByName("invoicePlanListTousseTypeArray");
 		boolean showDisposableGoods = CssdUtils.getSystemSetConfigByNameBool("invoicePlanExtractedView_showDisposableGoodsType");
 		if(StringTools.isBlank(tousseTypeArrayStr)){
@@ -2720,7 +2724,7 @@
 			json.put("name", "全部物品类型");
 			json.put("value", "");
 			array.add(json);
-			if(showDisposableGoods){
+			if(showDisposableGoods && !expressInvoice){
 				json = new JSONObject();
 				json.put("name", "全部一次性物品");
 				json.put("value", "是");
@@ -2737,7 +2741,7 @@
 			json.put("value", "否");
 			array.add(json);
 			
-			if(showDisposableGoods){
+			if(showDisposableGoods && !expressInvoice){
 				List<HttpOption> disposableGoodsTypes = httpOptionManager.getHttpOptionListById(HttpOption.SYSTEMSETTING_DIPOSABLEGOODS_TYPE);
 				if(CollectionUtils.isNotEmpty(disposableGoodsTypes)){
 					for(HttpOption option : disposableGoodsTypes){
@@ -2768,7 +2772,7 @@
 				.findAllInvoiceDepartment();
 		JSONUtil.addProperty(json, "invoiceGroups", groups);
 		JSONUtil.addProperty(json, "applyDateList", getInvoiceListApplyDateList(expressInvoice));
-		JSONUtil.addProperty(json, "tousseTypeArray", getInvoicePlanListTousseTypeArray());
+		JSONUtil.addProperty(json, "tousseTypeArray", getInvoicePlanListTousseTypeArray(expressInvoice));
 
 		return json.toString();
 		
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r21409 -r21450
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 21409)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 21450)
@@ -1362,7 +1362,7 @@
 			departCodes = Arrays.asList(StringUtils.split(orgUnitCoding, ';'));
 		}
 		String idSql = null;
-		if(StringUtils.isNotBlank(tousseDefinitionId)){
+		if(DatabaseUtil.isPoIdValid(tousseDefinitionId)){
 			idSql = String.format(" %s ",SqlUtils.getNonStringFieldPredicate("tousseDefinitionId", tousseDefinitionId));
 		}else{
 			idSql = String.format(" %s ",SqlUtils.getNonStringFieldPredicate("disposableGoodsId", disposableGoodsId));