Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/comboTousse/service/ComboTousseManagerImpl.java
===================================================================
diff -u -r29596 -r30933
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/comboTousse/service/ComboTousseManagerImpl.java	(.../ComboTousseManagerImpl.java)	(revision 29596)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/comboTousse/service/ComboTousseManagerImpl.java	(.../ComboTousseManagerImpl.java)	(revision 30933)
@@ -69,19 +69,9 @@
             if (tousseDefinition == null) {
                 throw new ParameterException("器械包定义不能为空!");
             }
-            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" +
+            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 ";
-            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) {
@@ -97,7 +87,7 @@
         	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("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)");
             List<Object> condition = new LinkedList<>();
             condition.add(TousseDefinition.PACKAGE_TYPE_INSIDE);
@@ -109,20 +99,7 @@
                     condition.add("%" + spell + "%");
                 }
             }
-            /*List<Map<String, Object>> resultMapList = null;
-             *试了调用下面的api方法,对于oracle数据库map的键名还是全大写,不起作用
-            if(condition.size() == 4){
-            	resultMapList = jdbcTemplate.queryForList(builder.toString(), condition.get(0), condition.get(1), condition.get(2), condition.get(3));
-            }else{
-            	resultMapList = jdbcTemplate.queryForList(builder.toString(), condition.get(0), condition.get(1), condition.get(2));
-            }*/
             List<Map<String, Object>> resultMapList = objectDao.findSqlByParam(builder.toString(), condition);
-            if(CollectionUtils.isNotEmpty(resultMapList)){
-            	//oracle数据库对map的键名替换为正确大小写的字段名
-            	if(DatabaseUtil.isOracle(dbConnection.getDatabase())){
-            		return convertResultMapList(resultMapList,queryColumnNameList);
-            	}
-            }
             return resultMapList;
         }
         catch (Exception e) {
@@ -131,24 +108,6 @@
         }
     }
 
-    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)
     public void saveOrUpdateComboTousses(String comboTousseArray, TousseDefinition tousseDefinition, boolean newTousse) {
@@ -320,10 +279,11 @@
         return list;
     }
 
-    @Override
+    @SuppressWarnings("unchecked")
+	@Override
     public List<ComboTousseComposite> getComboTousseTdByTdId(Long tousseDefinitionId) {
         String hql = "from ComboTousseComposite where tousseDefinitionId = ?";
-        return (List<ComboTousseComposite>) objectDao.findHqlByParam(hql, new Object[]{tousseDefinitionId}, -1, -1, ComboTousseComposite.class);
+        return (List<ComboTousseComposite>) objectDao.findHqlByParam(hql, new Object[]{tousseDefinitionId}, -1, -1);
     }
 
     /**
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/updateLog/ApplicationLogManagerImpl.java
===================================================================
diff -u -r22224 -r30933
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/updateLog/ApplicationLogManagerImpl.java	(.../ApplicationLogManagerImpl.java)	(revision 22224)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/updateLog/ApplicationLogManagerImpl.java	(.../ApplicationLogManagerImpl.java)	(revision 30933)
@@ -56,7 +56,7 @@
     public JSONObject loadRecyclingApplicationUpdateDetail(Long recyclingApplicationId, PageEntity pagePara) {
         String hql = " where recyclingApplicationId = ? ";
         @SuppressWarnings("unchecked")
-        List<ApplicationLog> list = objectDao.findHqlByParam(" from ApplicationLog " + hql, new Object[]{recyclingApplicationId}, pagePara.getStart(), pagePara.getLimit(), ApplicationLog.class);
+        List<ApplicationLog> list = objectDao.findHqlByParam(" from ApplicationLog " + hql, new Object[]{recyclingApplicationId}, pagePara.getStart(), pagePara.getLimit());
         int size = objectDao.countObjectBySql(ApplicationLog.class.getSimpleName(), hql, new Object[]{recyclingApplicationId});
         return this.buildUpdateDetailResult(list, size);
     }