Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r29735 -r29764
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 29735)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 29764)
@@ -3329,21 +3329,18 @@
 		try {
 			while(rs.next()){
 				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);
 				}
 				if(comboTousseItem == null){
 					comboTousseItem = new JSONObject();
 					comboTousseItem.put("id", id);
+					String comboTousseName = rs.getString("comboTousseName");
 					comboTousseItem.put("name", comboTousseName);
+					String packageType = rs.getString("packageType");
 					comboTousseItem.put("packageType", packageType);
+					String sterilingMethod = rs.getString("sterilingMethod");
 					comboTousseItem.put("sterilingMethod", sterilingMethod);
 					resultMap.put(id, comboTousseItem);
 				}
@@ -3362,14 +3359,15 @@
 				if(includeTousses == null){
 					includeTousses = new JSONArray();
 				}
+				Long tousseId = rs.getLong("ioid");
 				String key = id+"."+tousseId;
 				if(!addedTousseMap.containsKey(key)){
 					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);
+					ordinaryItem.put("name", rs.getString("tousseName"));
+					ordinaryItem.put("packageType", rs.getString("packageType"));
 					includeTousses.add(ordinaryItem);
 				}
 				comboTousseItem.put("includeTousses", includeTousses);