Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/StRoomControlHelper.java
===================================================================
diff -u -r20262 -r20600
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/StRoomControlHelper.java	(.../StRoomControlHelper.java)	(revision 20262)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/StRoomControlHelper.java	(.../StRoomControlHelper.java)	(revision 20600)
@@ -68,14 +68,14 @@
         if(StringUtils.isNotBlank(supplyRoomVo.getDepartment())){
         	condition = condition + " and ti.depart='"+ supplyRoomVo.getDepartment() +"'";
         }
-        String joinedBasketWhereSql = "from TousseInstance ti left join TousseDefinition td on ti.toussename = td.name "
+        String joinedBasketWhereSql = "from TousseInstance ti left join TousseDefinition td on ti.tousseDefinition_id = td.id "
                 + "left join ReviewedBasket rb on rb.id = ti.reviewBasket_id "
                 + "left join Container c on c.id = rb.container_id "
                 + "left join sterilization_reviewed st on st.reviewedBasket_id = rb.id "
                 + "left join SterilizationRecord sr on sr.id = st.sterilizationRecord_id "
                 + "left join Sterilizer s on s.id = sr.sterilizer_id "
                 + condition;
-        String notJoinedBasketWhereSql = "from TousseInstance ti left join TousseDefinition td on ti.toussename = td.name "
+        String notJoinedBasketWhereSql = "from TousseInstance ti left join TousseDefinition td on ti.tousseDefinition_id = td.id "
                 + "left join sterilization_tousseInstance st on st.tousseInstance_id = ti.id "
                 + "left join SterilizationRecord sr on sr.id = st.sterilizationRecord_id "
                 + "left join Sterilizer s on s.id = sr.sterilizer_id "
@@ -97,7 +97,7 @@
             notJoinedBasketWhereSql += String.format(" and %s", typeSql);
         }
         
-        String whereSql = "(" + joinedBasketSql + joinedBasketWhereSql + " union " + notJoinedBasketSql + notJoinedBasketWhereSql + ") alias " + groupBySql;
+        String whereSql = "(" + joinedBasketSql + joinedBasketWhereSql + " union all " + notJoinedBasketSql + notJoinedBasketWhereSql + ") alias " + groupBySql;
         return whereSql;
     }