Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r18484 -r18496
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 18484)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 18496)
@@ -7130,12 +7130,12 @@
 		
 		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,materialDefinition m where r.materialDefinitionId = m.id and r.errorType = '缺失' and r.type = '"+MaterialErrorDamageDetail.TYPE_ERROR+"' and r.materialName != '器械包标识牌' and r.additionalAmount > 0 and  "+getHandleDeptCodeSql("r.handleDepartCode")+" "
+				+ " from MaterialErrorDamageDetail r 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,MaterialDefinition m where i.materialDefinitionId = m.id "
+		+ "from MaterialErrorDamageDetail i 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 ) ";
 		
@@ -11457,6 +11457,7 @@
 	
 	/**
 	 * 物资收发明细报表
+	 * 一次性物品结算数据查询
 	 */
 	public List<MonthGoodsDetailVo> getStockTakeList(
 			StockTakeRecord startRecord, StockTakeRecord endRecord,
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
===================================================================
diff -u -r18440 -r18496
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 18440)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 18496)
@@ -383,6 +383,14 @@
 	 */
 	public List<GoodsAmountSummaryByGrade> getGoodsAmountSummaryByGrade(String timeStart, String timeEnd, String goodsName,String grade,String orgUnitName);
 
+	/**
+	 * 一次性物品结算数据查询
+	 * @param startRecord
+	 * @param endRecord
+	 * @param type
+	 * @param summaryType
+	 * @return
+	 */
 	public List<MonthGoodsDetailVo> getStockTakeList(StockTakeRecord startRecord, StockTakeRecord endRecord,String type, String summaryType);
 	
 	public List<MaterialTypeWorkloadReport> findMaterialTypeWorkloadReportList(String month,String querySupplyRoom);