Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/comboTousse/service/ComboTousseManagerImpl.java
===================================================================
diff -u -r29595 -r29596
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/comboTousse/service/ComboTousseManagerImpl.java	(.../ComboTousseManagerImpl.java)	(revision 29595)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/comboTousse/service/ComboTousseManagerImpl.java	(.../ComboTousseManagerImpl.java)	(revision 29596)
@@ -71,7 +71,18 @@
             }
             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()});
+            List<String> queryColumnNameList = new ArrayList<String>();
+        	queryColumnNameList.add("tousseDefinitionId");
+        	queryColumnNameList.add("tousseDefinitionName");
+        	queryColumnNameList.add("tousseAmount");
+        	List<Map<String, Object>> resultMapList = objectDao.findSqlByParam(sql, new Object[]{tousseDefinition.getId()});
+            if(CollectionUtils.isNotEmpty(resultMapList)){
+            	//oracle数据库对map的键名替换为正确大小写的字段名
+            	if(DatabaseUtil.isOracle(dbConnection.getDatabase())){
+            		return convertResultMapList(resultMapList,queryColumnNameList);
+            	}
+            }
+            return resultMapList;
         }
         catch (Exception e) {
             logger.error(e);
@@ -82,9 +93,9 @@
     @Override
     public List<Map<String, Object>> getTousse(String spell) {
         try {
-        	List<String> columnNames = new ArrayList<String>();
-        	columnNames.add("tousseDefinitionId");
-        	columnNames.add("tousseDefinitionName");
+        	List<String> queryColumnNameList = new ArrayList<String>();
+        	queryColumnNameList.add("tousseDefinitionId");
+        	queryColumnNameList.add("tousseDefinitionName");
             StringBuilder builder = new StringBuilder();
             builder.append("SELECT td.id AS tousseDefinitionId,td.name AS tousseDefinitionName FROM TousseDefinition td WHERE (td.tousseType = ? OR td.tousseType = ?) AND td.isDisable = ?");
             // builder.append(" and not exists (select ctc.id from ComboTousseComposite ctc where td.id = ctc.comboTousseDefinitionId)");
@@ -109,21 +120,7 @@
             if(CollectionUtils.isNotEmpty(resultMapList)){
             	//oracle数据库对map的键名替换为正确大小写的字段名
             	if(DatabaseUtil.isOracle(dbConnection.getDatabase())){
-            		List<Map<String, Object>> oracleResultMapList = new ArrayList<Map<String,Object>>();
-            		for(Map<String, Object> map : resultMapList){
-            			Map<String, Object> newMap = new HashMap<String, Object>();
-            			for(Entry<String,Object> entry : map.entrySet()){
-            				String key = entry.getKey();
-            				for(String columnName : columnNames){
-            					if(!StringUtils.equals(columnName, key) && StringUtils.equalsIgnoreCase(columnName, key)){
-            						newMap.put(columnName, entry.getValue());
-            						break;
-            					}
-            				}
-            			}
-            			oracleResultMapList.add(newMap);
-            		}
-            		return oracleResultMapList;
+            		return convertResultMapList(resultMapList,queryColumnNameList);
             	}
             }
             return resultMapList;
@@ -134,6 +131,23 @@
         }
     }
 
+    private List<Map<String, Object>> convertResultMapList(List<Map<String, Object>> resultMapList,List<String> queryColumnNameList){
+    	List<Map<String, Object>> oracleResultMapList = new ArrayList<Map<String,Object>>();
+    	for(Map<String, Object> map : resultMapList){
+			Map<String, Object> newMap = new HashMap<String, Object>();
+			for(Entry<String,Object> entry : map.entrySet()){
+				String key = entry.getKey();
+				for(String columnName : queryColumnNameList){
+					if(!StringUtils.equals(columnName, key) && StringUtils.equalsIgnoreCase(columnName, key)){
+						newMap.put(columnName, entry.getValue());
+						break;
+					}
+				}
+			}
+			oracleResultMapList.add(newMap);
+		}
+    	return oracleResultMapList;
+    }
 
     @Override
     @Transactional(propagation = Propagation.REQUIRED)