Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r23925 -r23936
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 23925)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 23936)
@@ -8526,7 +8526,12 @@
 		}
 		
 		String materialInvoiceSql = " ";
-		if (StringUtils.isBlank(typeSearch) || "器械材料".equals(typeSearch) || "高值耗材".equals(typeSearch)) {
+		String materialReturnSql = " ";
+		String lostMaterial = " ";
+		String damageMaterial = " ";
+		//当批次号为空时、且物品类型为空或器械材料或高值耗材时,才查询材料的发货、退货、丢失报损补充等数据
+		if(StringUtils.isBlank(batch)){
+		if ((StringUtils.isBlank(typeSearch) || "器械材料".equals(typeSearch) || "高值耗材".equals(typeSearch))) {
 			// 材料发货
 			materialInvoiceSql = " union all (select i.settleAccountsDepart,ii.materialName,sum(ii.amount),sum(ii.settlementPrice),"
 					+"sum(ii.settlementPrice) as settlementDiscountPrice,'材料' as type,'' as batchNumber,null as expDate,0 as tousseDefinitionId "
@@ -8540,7 +8545,7 @@
 					+ " group by i.settleaccountsdepart,ii.materialName) ";
 		}
 		// 材料退货
-		String materialReturnSql = " union all (select rr.depart as settleaccountsdepart,ii.materialName,-sum(ii.amount),-sum(ii.settlementPrice),"
+		materialReturnSql = " union all (select rr.depart as settleaccountsdepart,ii.materialName,-sum(ii.amount),-sum(ii.settlementPrice),"
 				+"-sum(ii.settlementPrice) as settlementDiscountPrice,'材料' as type,'' as batchNumber,null as expDate,0 as tousseDefinitionId "
 			   	+ " from ReturnMaterialRecord rr,materialDefinition d,"
 			   	+ "ReturnMaterialItem ii where rr.id = ii.returnMaterialRecord_ID " 
@@ -8551,7 +8556,18 @@
 			   	+ materialTypeFilterSql
 				+ " group by rr.depart,ii.materialName) ";
 		
-		//退货
+		lostMaterial = " union all (select r.depart,r.materialName,sum(r.additionalAmount),sum(r.additionalAmount * r.materialCost),"
+				+"sum(r.additionalAmount * r.materialCost) as settlementDiscountPrice,'材料' as type,'' as batchNumber,null as expDate,0 as tousseDefinitionId "
+				+ " from MaterialErrorDamageDetail r left join materialDefinition m on r.materialDefinitionId = m.id where 1=1 and r.errorType = '缺失' and r.type = '"+MaterialErrorDamageDetail.TYPE_ERROR+"' and r.materialName != '器械包标识牌' and r.additionalAmount > 0 and  "+getHandleDeptCodeSql("r.handleDepartCode")+" "
+				+ lostMaterialFilterSql + "group by r.depart,r.materialName ) ";
+		
+		damageMaterial = " union all (select i.depart,i.materialName,sum(i.additionalAmount),sum(i.materialCost*i.additionalAmount),"
+				+"sum(i.materialCost*i.additionalAmount) as settlementDiscountPrice,'材料' as type,'' as batchNumber,null as expDate,0 as tousseDefinitionId "
+				+ "from MaterialErrorDamageDetail i left join materialDefinition m on i.materialDefinitionId = m.id where 1=1 "
+				+ "and i.type = '" + MaterialErrorDamageDetail.TYPE_DAMAGE + "' and i.additionalAmount > 0 and  "+getHandleDeptCodeSql("i.handleDepartCode")+" " + damageFilterSql
+				+ " group by i.departCode,i.depart,i.materialName ) ";
+		}
+		//退货(一次性物品、器械包)
 		String returnGoodsSql = " union all (select rr.depart as settleaccountsdepart,ri.toussename as name,"
 					+ "-sum(ri.amount) as amount,-sum(ri.settlementPrice) as settlementprice,-sum(ri.settlementPrice) as settlementDiscountPrice,"
 					+returnGoodsTousseType+" as type"
@@ -8564,17 +8580,6 @@
 					+" and "+returnGoodsItemPredicate
 					+ " group by rr.depart,ri.toussename,"+returnGoodsTousseType+",ri.batchNumber,dgbs.expDate,"+returnGoodsTousseDefinitionId+") ";
 		
-		String lostMaterial = " union all (select r.depart,r.materialName,sum(r.additionalAmount),sum(r.additionalAmount * r.materialCost),"
-				+"sum(r.additionalAmount * r.materialCost) as settlementDiscountPrice,'材料' as type,'' as batchNumber,null as expDate,0 as tousseDefinitionId "
-				+ " from MaterialErrorDamageDetail r left join materialDefinition m on r.materialDefinitionId = m.id where 1=1 and r.errorType = '缺失' and r.type = '"+MaterialErrorDamageDetail.TYPE_ERROR+"' and r.materialName != '器械包标识牌' and r.additionalAmount > 0 and  "+getHandleDeptCodeSql("r.handleDepartCode")+" "
-			    + lostMaterialFilterSql + "group by r.depart,r.materialName ) ";
-		
-		String damageMaterial = " union all (select i.depart,i.materialName,sum(i.additionalAmount),sum(i.materialCost*i.additionalAmount),"
-		+"sum(i.materialCost*i.additionalAmount) as settlementDiscountPrice,'材料' as type,'' as batchNumber,null as expDate,0 as tousseDefinitionId "
-		+ "from MaterialErrorDamageDetail i left join materialDefinition m on i.materialDefinitionId = m.id where 1=1 "
-		+ "and i.type = '" + MaterialErrorDamageDetail.TYPE_DAMAGE + "' and i.additionalAmount > 0 and  "+getHandleDeptCodeSql("i.handleDepartCode")+" " + damageFilterSql
-		+ " group by i.departCode,i.depart,i.materialName ) ";
-		
 		String supplyRoomTousseTypeSql = "";
 		if(TYPE_AUTO_DEDUCTION.equals(typeSearch)){
 			supplyRoomTousseTypeSql = String.format(" and rr.type='%s' ", InvoiceItem.TYPE_AUTO_DEDUCTION);