Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
===================================================================
diff -u -r20892 -r20991
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 20892)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 20991)
@@ -116,9 +116,15 @@
 	
 	private String washEndTime = ""; // 清洗完成时间
 
-	private String operator;// 配包员
+	/**
+	 * 配包人
+	 */
+	private String operator;
 	
-	private String operatorCode;//配包员编码
+	/**
+	 * 配包人编码
+	 */
+	private String operatorCode;
 
 	private Date operationTime;// 操作时间
 
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingRecord.java
===================================================================
diff -u -r20892 -r20991
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingRecord.java	(.../PackingRecord.java)	(revision 20892)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingRecord.java	(.../PackingRecord.java)	(revision 20991)
@@ -42,7 +42,7 @@
 
 	private Long id;
 	/**
-	 * 装配人
+	 * 配包人
 	 */
 	private String packer;
 	/**
@@ -86,7 +86,7 @@
 	 */
 	private String inspector;
 	/**
-	 * 包装员
+	 * 包装人
 	 */
 	private String wrapper;
 	
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r20983 -r20991
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 20983)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 20991)
@@ -9643,10 +9643,10 @@
 			sequenceMap.put("清洗数量", 3);
 			sequenceMap.put("配包数量", 4);
 			sequenceMap.put("审核数量", 5);
-			sequenceMap.put("灭菌数量", 6);
-			sequenceMap.put("发货数量", 7);
-			sequenceMap.put("检查数量", 8);
-			sequenceMap.put("包装数量", 9);
+			sequenceMap.put("包装数量", 6);
+			sequenceMap.put("灭菌数量", 7);
+			sequenceMap.put("发货数量", 8);
+			sequenceMap.put("检查数量", 9);
 			sequenceMap.put("核对数量", 10);
 
 			//查询的时间段
@@ -9682,7 +9682,7 @@
 					
 					tousseAmountSql += " union all ";
 
-					//装配记录
+					//装配记录（配包数量）
 					tousseAmountSql += String.format("select '配包数量' type,pr.packer userName,sum(pr.amount) amount from PackingRecord pr "
 							+ "where pr.orgUnitCoding = '%s' and pr.packTime %s and pr.packer is not null and %s(pr.packer)<>0 "
 							+ "group by pr.packer ", querySupplyRoom,betweenSql,sqlLengthFunctionName);
@@ -9694,6 +9694,14 @@
 							+ "where ti.orgUnitCoding = '%s' and ti.reviewTime %s and %s(ti.reviewer) <> 0 "
 							+ "group by ti.reviewer ", querySupplyRoom,betweenSql,sqlLengthFunctionName);
 					
+					//装配记录（包装数量）
+					if (CssdUtils.getSystemSetConfigByNameBool("showWrapperField", false)) {
+						tousseAmountSql += " union all ";
+						tousseAmountSql += String.format("select '包装数量' type,pr.wrapper userName,sum(pr.amount) amount from PackingRecord pr "
+								+ "where pr.orgUnitCoding = '%s' and pr.packTime %s and pr.wrapper is not null and %s(pr.wrapper)<>0 "
+								+ "group by pr.wrapper ", querySupplyRoom,betweenSql,sqlLengthFunctionName);
+					}
+					
 					tousseAmountSql += " union all ";
 					
 					//灭菌记录
@@ -9730,11 +9738,6 @@
 				tousseAmountSql += String.format("select '检查数量' type,p.inspector userName,sum(pr.amount) amount from PackingRecord pr "
 						+ "where pr.orgUnitCoding= '%s' and pr.packTime %s and %s(pr.inspector)<>0 "
 						+ "group by pr.inspector ", supplyRoom_zsly,supplyRoom_zsly,sqlLengthFunctionName);
-				//包装数量
-				tousseAmountSql	+= " union all "; 
-				tousseAmountSql	+= String.format("select '包装数量' type,pr.wrapper userName,sum(pr.amount) amount from PackingRecord pr " 
-						+ "where pr.orgUnitCoding = '%s' and pr.packTime %s and %s(pr.wrapper)<>0 "
-				        + "group by pr.wrapper ", supplyRoom_zsly,betweenSql,sqlLengthFunctionName);
 			}
 					
 			ResultSet rs = objectDao.executeSql(tousseAmountSql);
@@ -9803,7 +9806,7 @@
 					
 					materialAmountSql += "union all ";
 
-					//装配记录
+					//装配记录（配包数量）
 					materialAmountSql += String.format("select '配包数量' type,pr.packer userName,sum(pr.amount * ms.count) amount from PackingRecord pr,tousseDefinition td,materialInstance ms "
 							+ "where pr.tousseDefinitionId = td.id and td.id = ms.tousse_id and pr.orgUnitCoding = '%s' and pr.packTime %s and pr.packer is not null and %s(pr.packer)<>0 "
 							+ "group by pr.packer ", querySupplyRoom,betweenSql,sqlLengthFunctionName);
@@ -9815,6 +9818,14 @@
 							+ "where ti.tousseDefinition_id = td.id and td.id = ms.tousse_id and ti.orgUnitCoding = '%s' and ti.reviewTime %s and ti.reviewer is not null and %s(ti.reviewer) <> 0 "
 							+ "group by ti.reviewer ", querySupplyRoom,betweenSql,sqlLengthFunctionName);
 					
+					//装配记录（包装数量）
+					if (CssdUtils.getSystemSetConfigByNameBool("showWrapperField", false)) {
+						materialAmountSql += " union all "; 
+						materialAmountSql += String.format("select '包装数量' type,pr.wrapper userName,sum(pr.amount * ms.count) amount from PackingRecord pr,tousseDefinition td,materialInstance ms " 
+								+ "where pr.tousseDefinitionId = td.id and td.id = ms.tousse_id and pr.orgUnitCoding = '%s' and pr.packTime %s and pr.wrapper is not null and %s(pr.wrapper)<>0 "
+						        + "group by pr.wrapper ", querySupplyRoom,betweenSql,sqlLengthFunctionName);
+					}
+					
 					materialAmountSql += " union all ";
 					
 					materialAmountSql += "select '灭菌数量' type,tmp.userName,sum(tmp.amount) from (";
@@ -9858,11 +9869,6 @@
 				materialAmountSql += String.format("select '检查数量' type,p.inspector userName,sum(pr.amount * ms.count) amount from PackingRecord pr,tousseDefinition td,materialInstance ms "
 						+ "where pr.tousseDefinitionId = td.id and td.id = ms.tousse_id and pr.orgUnitCoding= '%s' and pr.packTime %s and pr.inspector is not null and %s(pr.inspector)<>0 "
 						+ "group by pr.inspector ", supplyRoom_zsly,supplyRoom_zsly,sqlLengthFunctionName);
-				//包装数量
-				materialAmountSql	+= "union all "; 
-				materialAmountSql	+= String.format("select '包装数量' type,pr.wrapper userName,sum(pr.amount * ms.count) amount from PackingRecord pr,tousseDefinition td,materialInstance ms " 
-						+ "where pr.tousseDefinitionId = td.id and td.id = ms.tousse_id and pr.orgUnitCoding = '%s' and pr.packTime %s and pr.wrapper is not null and %s(pr.wrapper)<>0 "
-				        + "group by pr.wrapper ", supplyRoom_zsly,betweenSql,sqlLengthFunctionName);
 			}
 					
 			ResultSet rs2 = objectDao.executeSql(materialAmountSql);