Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r20023 -r20076
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 20023)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 20076)
@@ -830,7 +830,7 @@
 						toolAndImplantAmount.optInt("toolAmount"),
 						toolAndImplantAmount.optInt("implantAmount"),department, 
 						td.getPrintOrgSource(),idCardDefinitionUseAmount,objectDao,td.getBarcodePaperType(),tousseInstance.getWashOperator(),tousseInstance.getWashOperatorCode(),
-					tousseInstance.getWeight(),tousseInstance.getRemark(),td.getPrintAmount(),BooleanUtils.toBooleanDefaultIfNull(tousseInstance.getHaveUnSupplementMaterials(), false),tousseInstance.getIsUrgentTousse());
+					tousseInstance.getWeight(),tousseInstance.getRemark(),td.getPrintAmount(),BooleanUtils.toBooleanDefaultIfNull(tousseInstance.getHaveUnSupplementMaterials(), false),tousseInstance.getIsUrgentTousse(),tousseInstance.getTousseInstancesAmountBelongToThisComboTousse(objectDao));
 				// 特殊单的包实例处理
 				if(tousseInstance.getForeignProxyItem_id() != null){
 					ForeignProxyDisinfection foreignProxyDisinfection = tousseInstance.getForeignProxyDisinfection(objectDao);
@@ -1004,6 +1004,7 @@
 		if(StringUtils.isNotBlank(department)){
 			obj.put("department", department);
 		}
+		obj.put("includedTousseAmount", tousseInstance.getTousseInstancesAmountBelongToThisComboTousse(objectDao));
 	}
 
 	@Override
@@ -2226,7 +2227,7 @@
 					toolAndImplantAmount.optInt("toolAmount"),
 					toolAndImplantAmount.optInt("implantAmount"),TousseInstanceUtils.getTousseInstanceDepartForPrint(tousseInstance) , td.getPrintOrgSource(),
 					idCardDefinitionUseAmount,objectDao,td.getBarcodePaperType(),tousseInstance.getWashOperator(),tousseInstance.getWashOperatorCode(),
-					tousseInstance.getWeight(),tousseInstance.getRemark(),1,BooleanUtils.toBooleanDefaultIfNull(tousseInstance.getHaveUnSupplementMaterials(), false),tousseInstance.getIsUrgentTousse());// TODO 需要确认审核后打印，是否也支持打印多份
+					tousseInstance.getWeight(),tousseInstance.getRemark(),1,BooleanUtils.toBooleanDefaultIfNull(tousseInstance.getHaveUnSupplementMaterials(), false),tousseInstance.getIsUrgentTousse(),tousseInstance.getTousseInstancesAmountBelongToThisComboTousse(objectDao));// TODO 需要确认审核后打印，是否也支持打印多份
 			toussesArray.add(obj);
 			JSONObject logObj = new JSONObject();
 			JSONUtil.addLogProperty(logObj, "tousseInstanceId", tousseInstance.getId());
@@ -3708,7 +3709,7 @@
 									tousse.optInt("toolAmount"),
 									tousse.optInt("implantAmount"),tousse.optString("department"),
 									td.getPrintOrgSource(),0L,objectDao,td.getBarcodePaperType(),tousse.optString("washOperator"),tousse.optString("washOperatorCode"),
-									tousse.optString("weight"),tousse.optString("remark"),tousse.optInt("printAmount"),false,tousse.optString("isUrgentTousse"));
+									tousse.optString("weight"),tousse.optString("remark"),tousse.optInt("printAmount"),false,tousse.optString("isUrgentTousse"),0);
 	
 							setPrintCause(currentPackingTask,obj);
 							toussesArray.add(obj);
@@ -3766,7 +3767,7 @@
 									toolAndImplantAmount.optInt("toolAmount"),
 									toolAndImplantAmount.optInt("implantAmount"),TousseInstanceUtils.getTousseInstanceDepartForPrint(tousse), 
 									td.getPrintOrgSource(),idCardDefinitionUseAmount,objectDao,td.getBarcodePaperType(),tousse.getWashOperator(),tousse.getWashOperatorCode(),
-								tousse.getWeight(),tousse.getRemark(),td.getPrintAmount(),BooleanUtils.toBooleanDefaultIfNull(tousse.getHaveUnSupplementMaterials(), false),tousse.getIsUrgentTousse());
+								tousse.getWeight(),tousse.getRemark(),td.getPrintAmount(),BooleanUtils.toBooleanDefaultIfNull(tousse.getHaveUnSupplementMaterials(), false),tousse.getIsUrgentTousse(),0);
 							setPrintCause(currentPackingTask,obj);
 							toussesArray.add(obj);
 						}
@@ -5914,7 +5915,7 @@
 				ti.getOperationTime(), false, false, true, isReview,
 				isTraceable, td.getIsBigPackage(), "", null, 0l, "", 0,
 				0, "", TousseDefinition.PRINGORGSOURCE_NONE, 0l, objectDao, td.getBarcodePaperType(), "", "",
-				"",remark,printAmount ,BooleanUtils.toBooleanDefaultIfNull(ti.getHaveUnSupplementMaterials(), false),ti.getIsUrgentTousse());
+				"",remark,printAmount ,BooleanUtils.toBooleanDefaultIfNull(ti.getHaveUnSupplementMaterials(), false),ti.getIsUrgentTousse(),ti.getTousseInstancesAmountBelongToThisComboTousse(objectDao));
 	}
 
 	private JSONObject getTousseDefinitionPrintJsonForComboTousse(
Index: ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
===================================================================
diff -u -r19166 -r20076
--- ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js	(.../rePrintBarcodeWin.js)	(revision 19166)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js	(.../rePrintBarcodeWin.js)	(revision 20076)
@@ -112,6 +112,7 @@
 				{name : 'remark'},
 				{name : 'applicantDepart'},
 				{name : 'isUrgentTousse'},
+				{name : 'includedTousseAmount'},
 				{name : 'haveUnSupplementMaterials'}
 			]
 		}),
Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
===================================================================
diff -u -r19982 -r20076
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 19982)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 20076)
@@ -222,6 +222,10 @@
 		propName: 'totalAmount',
 		displayName: '材料总数',
 		textForPreview: '10'
+	}),new ObjectDataSourceProperty({
+		propName: 'includedTousseAmount',
+		displayName: '聚合包总个数',
+		textForPreview: '10'
 	})]
 });
 objectDataSourceManager.registerDataSource(normalTousseDataSource);
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
===================================================================
diff -u -r20007 -r20076
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java	(.../CssdUtils.java)	(revision 20007)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java	(.../CssdUtils.java)	(revision 20076)
@@ -1170,7 +1170,8 @@
 			int implantAmount, String department, String printOrgSource,
 			Long idCardDefinitionUseAmount, ObjectDao objectDao,
 			String barcodePaperType, String washOperator,
-			String washOperatorCode, String weight,String remark, int printAmount,boolean haveUnSupplementMaterials,String isUrgentTousse) {
+			String washOperatorCode, String weight,String remark, int printAmount,boolean haveUnSupplementMaterials,String isUrgentTousse,
+			int includedTousseAmount) {
 		JSONObject obj = new JSONObject();
 		obj.put("tousseName", tousseName);  // 名称
 		obj.put("tousseDefinition", tdJson);
@@ -1222,6 +1223,7 @@
 		obj.put("weight", weight);
 		obj.put("remark", remark);
 		obj.put("printAmount", printAmount);
+		obj.put("includedTousseAmount", includedTousseAmount);
 		
 		String packTime = com.forgon.Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS.format(operationTime);
 		
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
===================================================================
diff -u -r19774 -r20076
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 19774)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 20076)
@@ -1282,6 +1282,20 @@
 		String sql = String.format("where %s", SqlUtils.getLongFieldPredicate("po.comboTousseInstanceId", id));
 		return objectDao.findBySql(TousseInstance.class.getSimpleName(), sql);
 	}
+	/**
+	 * 获取属于这个聚合包的包实例数量
+	 * @return List
+	 */
+	public int getTousseInstancesAmountBelongToThisComboTousse(ObjectDao objectDao ) {
+		if(id == null){
+			return 0;
+		}
+		if(!isComboTousse()){
+			return 0;
+		}
+		String sql = String.format("where %s", SqlUtils.getLongFieldPredicate("po.comboTousseInstanceId", id));
+		return objectDao.countObjectBySql(TousseInstance.class.getSimpleName(), sql);
+	}
 	
 	/**
 	 * 获取属于包实例的Invoice对象