Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/ComboTousseComposite.java
===================================================================
diff -u -r24172 -r28579
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/ComboTousseComposite.java	(.../ComboTousseComposite.java)	(revision 24172)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/ComboTousseComposite.java	(.../ComboTousseComposite.java)	(revision 28579)
@@ -49,7 +49,10 @@
 	 * 序列，用来保存聚合包下的器械包顺序
 	 */
 	private Integer sequence;
-
+	/**
+	 * 聚合包内的普通器械包的包数量
+	 */
+	private Integer tousseAmount;
 	@Id
 	@GeneratedValue(strategy=GenerationType.AUTO)
 	public Long getId() {
@@ -83,4 +86,12 @@
 	public void setSequence(Integer sequence) {
 		this.sequence = sequence;
 	}
+
+	public Integer getTousseAmount() {
+		return tousseAmount;
+	}
+
+	public void setTousseAmount(Integer tousseAmount) {
+		this.tousseAmount = tousseAmount;
+	}
 }
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/comboTousse/service/ComboTousseManagerImpl.java
===================================================================
diff -u -r17174 -r28579
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/comboTousse/service/ComboTousseManagerImpl.java	(.../ComboTousseManagerImpl.java)	(revision 17174)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/comboTousse/service/ComboTousseManagerImpl.java	(.../ComboTousseManagerImpl.java)	(revision 28579)
@@ -53,7 +53,7 @@
             if (tousseDefinition == null) {
                 throw new ParameterException("器械包定义不能为空!");
             }
-            String sql = "select td.id as tousseDefinitionId,td.name as tousseDefinitionName,ctc.id as id from TousseDefinition td join ComboTousseComposite ctc on td.id = ctc.tousseDefinitionId" +
+            String sql = "select td.id as tousseDefinitionId,td.name as tousseDefinitionName,ctc.id as id,ctc.tousseAmount as tousseAmount from TousseDefinition td join ComboTousseComposite ctc on td.id = ctc.tousseDefinitionId" +
                     " where ctc.comboTousseDefinitionId = ? order by ctc.sequence ";
             return objectDao.findSqlByParam(sql, new Object[]{tousseDefinition.getId()});
         }
@@ -122,6 +122,7 @@
                     if (list.getId().equals(update.getId())) {
                         list.setTousseDefinitionId(update.getTousseDefinitionId());
                         list.setSequence(update.getSequence());
+                        list.setTousseAmount(update.getTousseAmount());
                         updateFlag = true;
                         break;
                     }
@@ -314,6 +315,7 @@
             combo.setComboTousseDefinitionId(tousseDefinition.getId());
             combo.setTousseDefinitionId(comboTousseComposite.getTousseDefinitionId());
             combo.setSequence(comboTousseComposite.getSequence());
+            combo.setTousseAmount(comboTousseComposite.getTousseAmount());
             list.add(combo);
         }
         objectDao.batchSaveOrUpdate(list);
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r28373 -r28579
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 28373)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 28579)
@@ -3169,7 +3169,7 @@
 			selectUnitCode = true;
 		}
 		
-		String sql = String.format("select po.id,po.name,po.packageType,po.sterilingMethod,io.id,io.name,io.packageType %s from %s po, %s bo, %s io %s where po.id = bo.comboTousseDefinitionId "
+		String sql = String.format("select po.id poId,po.name comboTousseName,po.packageType,po.sterilingMethod,io.id ioid,io.name tousseName,io.packageType,bo.tousseAmount %s from %s po, %s bo, %s io %s where po.id = bo.comboTousseDefinitionId "
 				+ "and bo.tousseDefinitionId = io.id %s and po.tousseType = '%s' %s %s and (po.isDisable = '%s' or po.isDisable is null) order by po.name ", selComboTousseOrgUint,
 				TousseDefinition.class.getSimpleName(),ComboTousseComposite.class.getSimpleName(),
 				TousseDefinition.class.getSimpleName(),joinComboTousseOrgUint,whereComboTousseOrgUint,TousseDefinition.PACKAGE_TYPE_COMBO,spellSql,comboTousseOrgUnitCodingSql, Constants.STR_NO);
@@ -3179,13 +3179,13 @@
 		Map<String,Boolean> addedTousseMap = new HashMap<String, Boolean>();
 		try {
 			while(rs.next()){
-				Long id = rs.getLong(1);
-				String comboTousseName = rs.getString(2);
-				String packageType = rs.getString(3);
-				String sterilingMethod = rs.getString(4);
-				Long tousseId = rs.getLong(5);
-				String tousseName = rs.getString(6);
-				String toussePackageType = rs.getString(7);
+				Long id = rs.getLong("poId");
+				String comboTousseName = rs.getString("comboTousseName");
+				String packageType = rs.getString("packageType");
+				String sterilingMethod = rs.getString("sterilingMethod");
+				Long tousseId = rs.getLong("ioid");
+				String tousseName = rs.getString("tousseName");
+				String toussePackageType = rs.getString("packageType");
 				JSONObject comboTousseItem = resultMap.get(id);
 				if(!idList.contains(id)){
 					idList.add(id);
@@ -3199,7 +3199,7 @@
 					resultMap.put(id, comboTousseItem);
 				}
 				if(selectUnitCode){
-					String unitCode = rs.getString(8);
+					String unitCode = rs.getString("unitCode");
 					Set<String> unitCodeSet = idToUnitCodeSetMap.get(id);
 					if(unitCodeSet == null){
 						unitCodeSet = new HashSet<String>();
@@ -3218,6 +3218,7 @@
 					addedTousseMap.put(key, true);
 					JSONObject ordinaryItem = new JSONObject();
 					ordinaryItem.put("id", tousseId);
+					ordinaryItem.put("tousseAmount", rs.getInt("tousseAmount"));
 					ordinaryItem.put("name", tousseName);
 					ordinaryItem.put("packageType", toussePackageType);
 					includeTousses.add(ordinaryItem);