Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java
===================================================================
diff -u -r27800 -r27824
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java	(.../WdRoomControlHelper.java)	(revision 27800)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java	(.../WdRoomControlHelper.java)	(revision 27824)
@@ -75,7 +75,7 @@
                 + " left join ClassifiedItem ci on cb.id = ci.classifybasket_id "
                 + " left join RecyclingRecord rr on ci.recyclingRecordId=rr.id "
                 + " left join TousseDefinition td on ci.tousseDefinitionID=td.id "
-                + " where ci.itemType = '材料' "
+                + " where 1=1 "
                 + whereSqlForOrgUnitCoding
                 + " and wr.washMaterialAmount <> 0 "
                 + " and wr.endDate between "
@@ -89,7 +89,7 @@
 
         if (StringUtils.isNotBlank(tousseName)) {
             if (TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseType)) {
-                whereSql += " and (ci.tousseNameForMaterial like '%" + tousseName + "%' or (ci.itemType = '" + TousseDefinition.PACKAGE_TYPE_DISINFECTION + "' and ci.name = '" + tousseName + "'))";
+                whereSql += " and (ci.tousseNameForMaterial like '%" + tousseName + "%' or (td.tousseType = '" + TousseDefinition.PACKAGE_TYPE_DISINFECTION + "' and ci.name = '" + tousseName + "'))";
             }
             else {
                 whereSql += " and td.name = '" + tousseName + "'";
@@ -98,7 +98,7 @@
         if (StringUtils.isNotBlank(taskGroup) && !"全部".equals(taskGroup)) {
             whereSql += String.format(" and ci.toussedefinition_id in (select cht.tousseDefinitionId from CssdHandleTousses cht where cht.taskGroup = '%s' and cht.orgUnitCode = '%s')", taskGroup, AcegiHelper.getLoginUser().getCurrentOrgUnitCode());
         }
-        String typeSql = supplyRoomControlManagerImpl2.getGoodsTypeByComboTousseType(supplyRoomVo.getComboTousseType(),"itemType", "ci");
+        String typeSql = supplyRoomControlManagerImpl2.getGoodsTypeByComboTousseType(supplyRoomVo.getComboTousseType(),"tousseType", "td");
         if (StringUtils.isNotBlank(typeSql)){
             whereSql += String.format(" and %s", typeSql);
         }
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r27777 -r27824
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 27777)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 27824)
@@ -9077,7 +9077,7 @@
 					}else{
 						key = "外来器械二次清洗";
 					}
-				}else if(ClassifiedItem.TYPE_DISINFECTION_GOODS.equals(type)){
+				}else if(ClassifiedItem.TYPE_DISINFECTION_GOODS.equals(tousseType)){
 					key = "消毒物品";
 					
 				}else{
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
===================================================================
diff -u -r27768 -r27824
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java	(.../DataIndex.java)	(revision 27768)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java	(.../DataIndex.java)	(revision 27824)
@@ -390,7 +390,7 @@
 			if(obj.showAsTousseSplitAmount){
 				amountSelectSql = "ci.materialSplitAmount";
 			}else{
-				amountSelectSql = "ci.amount";
+				amountSelectSql = "ci.amount-case when numOfUnwashedStops is null then 0 else numOfUnwashedStops end";
 			}
 			// 统计清洗项的itemType为材料的物品，包括拆包清洗的器械包以及外来器械包
 			amountSql += String