Index: ssts-web/src/main/webapp/jasperRtp/tousseWorkLoadForDLZXYY.jrxml
===================================================================
diff -u -r35155 -r35184
--- ssts-web/src/main/webapp/jasperRtp/tousseWorkLoadForDLZXYY.jrxml	(.../tousseWorkLoadForDLZXYY.jrxml)	(revision 35155)
+++ ssts-web/src/main/webapp/jasperRtp/tousseWorkLoadForDLZXYY.jrxml	(.../tousseWorkLoadForDLZXYY.jrxml)	(revision 35184)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="tousseWorkLoad" language="groovy" pageWidth="2125" pageHeight="800" columnWidth="2125" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="5cc580bd-cd6f-4e34-8f78-a05ac8f31ce8">
 	<property name="ireport.zoom" value="0.6830134553650712"/>
-	<property name="ireport.x" value="331"/>
+	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table_TH" mode="Opaque" backcolor="#F0F8FF">
 		<box>
@@ -202,7 +202,7 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
-				<text><![CDATA[器械包名称]]></text>
+				<text><![CDATA[临床器械组]]></text>
 			</staticText>
 			<staticText>
 				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="45" y="80" width="80" height="69"/>
Index: ssts-web/src/main/webapp/jasperRtp/tousseWorkLoadForDLZXYY.jasper
===================================================================
diff -u -r35155 -r35184
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r35157 -r35184
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35157)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35184)
@@ -29650,6 +29650,8 @@
 		if(StringUtils.isBlank(yyyyMM)){
 			return null;
 		}
+		String nonWovenStr = "无纺布包装";
+		String paperPlasticStr = "纸塑包装";
 		String yyyy = yyyyMM.substring(0,4);
 		String mm =  yyyyMM.substring(5);
 		//本月最后一天
@@ -29669,7 +29671,7 @@
 		String groupDay = dateQueryAdapter.dateConverAdapter3("endDate","dd");
 		params.extraSelectColumns = ",tdc.packageType, " + groupDay + " dateTime ";
 		params.extraGroupBy = " group by tdc.packageType, "+ groupDay;//
-		params.extraQuery = " and tdc.packageType in ('无纺布','纸塑') and tdc.taskGroup='临床器械组' ";
+		params.extraQuery = " and tdc.packageType in ('"+ nonWovenStr +"','"+ paperPlasticStr +"') and tdc.taskGroup='临床器械组' ";
 	    String washMaterialSQL = String.format("select packageType,sum(tl.amount) amount,dateTime from ("
 					+dataIndex.getWorkAmountByMaterialSQL("清洗数量", params, dataSoureOfMaterialsCountOfToussesInReports)
 					+ ") tl group by packageType,dateTime ");
@@ -29689,9 +29691,9 @@
 					vo = new TousseWorkLoadVOForDLZXYY(day + "");
 					dayMap.put(day, vo);
 				}
-				if("无纺布".equals(packageType)){
+				if(nonWovenStr.equals(packageType)){
 					vo.setNonWovenWashMaterialsNum(amount);
-				}else if("纸塑".equals(packageType)){
+				}else if(paperPlasticStr.equals(packageType)){
 					vo.setPaperPlasticWashMaterialsNum(amount);
 				}
 			}
@@ -29725,9 +29727,9 @@
 					vo = new TousseWorkLoadVOForDLZXYY(day + "");
 					dayMap.put(day, vo);
 				}
-				if("无纺布".equals(packageType)){
+				if(nonWovenStr.equals(packageType)){
 					vo.setNonWovenWashTousseNum(amount);
-				}else if("纸塑".equals(packageType)){
+				}else if(paperPlasticStr.equals(packageType)){
 					vo.setPaperPlasticWashTousseNum(amount);
 				}
 			}
@@ -29885,7 +29887,7 @@
 		}
 		params.extraSelectColumns = ",tdc.packageType,"+groupDay +" dateTime,i.depart ";
 		params.extraGroupBy = " tdc.packageType,i.depart,"+groupDay;
-		params.extraQuery = " and tdc.packageType in('硬质容器','无纺布','纸塑') and i.depart in('第一手术室','第二手术室') and tdc.tousseType in ('"+ TousseDefinition.PACKAGE_TYPE_FOREIGN +"','"+ TousseDefinition.PACKAGE_TYPE_SPLIT +"') ";
+		params.extraQuery = " and tdc.packageType in('硬质容器','"+ nonWovenStr +"','"+ paperPlasticStr +"') and i.depart in('第一手术室','第二手术室') and tdc.tousseType in ('"+ TousseDefinition.PACKAGE_TYPE_FOREIGN +"','"+ TousseDefinition.PACKAGE_TYPE_SPLIT +"') ";
 		String factorySql = String.format("select sum(tl.amount) amount,packageType,depart,dateTime from ("
 				+dataIndex.getWorkAmountByPackageSQL("发货数量", params)
 				+ ") tl group by packageType,depart,dateTime");
@@ -29910,13 +29912,13 @@
 					}else if("第二手术室".equals(depart)){
 						vo.setHardContainerFactoryTousseNum2(amount);
 					}
-				}else if("无纺布".equals(packageType)){
+				}else if(nonWovenStr.equals(packageType)){
 					if("第一手术室".equals(depart)){
 						vo.setNonWovenFactoryTousseNum1(amount);
 					}else if("第二手术室".equals(depart)){
 						vo.setNonWovenFactoryTousseNum2(amount);
 					}
-				}else if("纸塑".equals(packageType)){
+				}else if(paperPlasticStr.equals(packageType)){
 					if("第一手术室".equals(depart)){
 						vo.setPaperPlasticFactoryTousseNum1(amount);
 					}else if("第二手术室".equals(depart)){