Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/StRoomControlHelper.java
===================================================================
diff -u -r27800 -r28082
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/StRoomControlHelper.java	(.../StRoomControlHelper.java)	(revision 27800)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/StRoomControlHelper.java	(.../StRoomControlHelper.java)	(revision 28082)
@@ -93,7 +93,7 @@
                 + "left join SterilizationRecord sr on sr.id = st.sterilizationRecord_id "
                 + "left join Sterilizer s on s.id = sr.sterilizer_id "
                 + condition;
-        String groupBySql = " group by alias.\"tousseName\",alias.\"id\",alias.\"operator\",alias.\"disinfectProgram\",alias.\"frequency\",alias.\"disinfectIdentification\",alias.\"startDate\",alias.\"endDate\",alias.\"basketName\"";
+        String groupBySql = " group by \"tousseName\",\"id\",\"operator\",\"disinfectProgram\",\"frequency\",\"disinfectIdentification\",\"startDate\",\"endDate\",\"basketName\"";
         if (StringUtils.isNotBlank(tousseName)) {
             String tousseNameSql = " and ti.tousseName = '" + tousseName + "'";
             joinedBasketWhereSql += tousseNameSql;
Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java
===================================================================
diff -u -r27895 -r28082
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java	(.../SupplyRoomControlManagerImpl2.java)	(revision 27895)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java	(.../SupplyRoomControlManagerImpl2.java)	(revision 28082)
@@ -97,10 +97,10 @@
     public Map<String, Object> getWashDisinfectionList(SupplyRoomVo supplyRoomVo) {
         try {
             String selectSql = wdRoomControlHelper.buildWhereSql(supplyRoomVo);
-            String countSql = "select count(*),sum(amount),1 from ("
+            String countSql = "select count(*),sum(\"amount\"),1 from ("
             		+ selectSql
-            		+ ")countTemp ";
-            selectSql = " select * from (" + selectSql + ")temp order by endDate desc";
+            		+ ") countTemp ";
+            selectSql = " select * from (" + selectSql + ")selectTemp order by \"endDate\" desc";
             logger.debug("[sql]:" + selectSql);
             return this.getResult(wdRoomControlHelper, selectSql, countSql);
         }
@@ -150,7 +150,7 @@
             String selectSql = stRoomControlHelper.buildSelectSql(supplyRoomVo);
             String whereSql = stRoomControlHelper.buildWhereSql(supplyRoomVo);
             Map<String, Object> countSqlS = stRoomControlHelper.getCountSqlS(whereSql);
-            selectSql += whereSql + " order by startDate desc ";
+            selectSql += whereSql + " order by \"startDate\" desc ";
             logger.debug("[sql]:" + selectSql);
             return this.getResult(stRoomControlHelper, selectSql, countSqlS);
         }
Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
===================================================================
diff -u -r28056 -r28082
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java	(.../SupplyRoomControlManagerImpl.java)	(revision 28056)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java	(.../SupplyRoomControlManagerImpl.java)	(revision 28082)
@@ -135,7 +135,7 @@
         }else{
         	typeSql2 = "";
         }
-		String sql = " select * from (select distinct ip.id as id,po.tousseName as tousseName,po.amount as amount,ip.depart as depart,po.recyclingAmount as recyclingAmount,ip.applicationTime as applicationTime,ip.submitTime as submitTime,ip.printTime as printTime,ip.applicant as applicant,po.diposable as diposable,rr.recyclingTime as recyclingTime,po.basketName as basketName "
+		String sql = " select * from (select distinct ip.id as \"id\",po.tousseName as \"tousseName\",po.amount as \"amount\",ip.depart as \"depart\",po.recyclingAmount as \"recyclingAmount\",ip.applicationTime as \"applicationTime\",ip.submitTime as \"submitTime\",ip.printTime as \"printTime\",ip.applicant as \"applicant\",po.diposable as \"diposable\",rr.recyclingTime as \"recyclingTime\",po.basketName as \"basketName\" "
 		 			 + " from TousseItem po join invoicePlan ip on po.RecyclingApplication_id = ip.id "
 					 +" left join RecyclingRecord rr on rr.recyclingApplication_id = ip.id  "
 					 +" left join RecyclingItem ri on rr.id = ri.recyclingRecord_id and ri.tousseDefinitionId = po.toussedefinitionid "
@@ -164,10 +164,10 @@
 		if(StringUtils.isNotBlank(departCoding)){
 			sql += " and po.depart = '"+departCoding+"'";
 		}
-		String countSql = "select count(*),sum(temp.amount),sum(temp.recyclingAmount) from ("
+		String countSql = "select count(*),sum(temp.\"amount\"),sum(temp.\"recyclingAmount\") from ("
 		+ 	sql
 		+" )temp  ";
-		sql += " order by po.depart ,po.applicationTime desc ";
+		sql += " order by po.\"depart\" ,po.\"applicationTime\" desc ";
 		Integer [] amountArry = countBySql(countSql);
 		int totalCount = amountArry[0];
 		int totalAppAmount = amountArry[1];
@@ -210,7 +210,7 @@
 		}else{
 			whereSqlForOrgUnitCoding = "";
 		}
-		String countSql = "select count(*),sum(amount),sum(amount) ";
+		String countSql = "select count(*),sum(\"amount\"),sum(\"amount\") ";
 		String selectSql = "select wr.id as \"id\",ci.name as \"tousseName\",(ci.amount-case when numOfUnwashedStops is null then 0 else numOfUnwashedStops end) as \"amount\"," +
 					 "wr.startDate as \"startDate\",wr.endDate as \"endDate\","+
 					 "wr.operator as \"operator\",wr.disinfectIdentification as \"disinfectIdentification\"," +
@@ -236,7 +236,7 @@
         }else{
         	typeSql = "";
         }
-        String sql = selectSql + " from WashAndDisinfectRecord wr "
+        String sql = "select * from (" + selectSql + " from WashAndDisinfectRecord wr "
                 + " left join ClassifyBasket_WashRecord cw on wr.id = cw.WashAndDisinfectRecord_ID"
                 + " left join ClassifyBasket cb on cb.id = cw.ClassifyBasket_ID"
                 + " left join ClassifiedItem ci on cb.id = ci.classifybasket_id "
@@ -269,7 +269,8 @@
                 + dateQueryAdapter.dateAdapter(endDate)
                 + departSql
                 + tousseNameSql
-                + typeSql;
+                + typeSql
+                + " ";
         selectSql = " union all select wr.id as \"id\",ci.name as \"tousseName\",(ci.amount-case when numOfUnwashedStops is null then 0 else numOfUnwashedStops end)*ci.materialAmount as \"amount\"," +
                 "wr.startDate as \"startDate\",wr.endDate as \"endDate\"," +
                 "wr.operator as \"operator\",wr.disinfectIdentification as \"disinfectIdentification\"," +
@@ -306,9 +307,9 @@
                     + " and "
                     + dateQueryAdapter.dateAdapter(endDate);
         }
-		
+		sql += ")t";
 		countSql = countSql + " from (" + sql + ")temp";
-		sql += " order by wr.endDate desc ";
+		sql += " order by \"endDate\" desc ";
 		Integer [] amountArray = countBySql(countSql);
 		int totalCount = amountArray[0];
 		int totalWashAmount = amountArray[1];
@@ -620,7 +621,7 @@
         if (StringUtils.isNotBlank(typeSql)) {
             whereSql += String.format(" and %s", typeSql);
         }
-		sql += whereSql + " order by depart,senderTime desc";
+		sql += whereSql + " order by \"depart\",\"senderTime\" desc";
 		countSql += whereSql;
 		Integer [] amountArray = countBySql(countSql);
 		int totalCount = amountArray[0];