Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r29054 -r29085
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 29054)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 29085)
@@ -813,16 +813,26 @@
 				}
 			}
 		}
+		List<InvoicePlan> invoicePlans = null;
 		String deptCodes = null;
 		if(StringUtils.isNotBlank(departmentGroupId)){
-			DepartmentGroup group = departmentGroupManager.get(departmentGroupId);
-			if(group != null){
-				deptCodes = group.getDepartCodes();
-				deptCodes = deptCodes.replaceAll(";", "','");
+			try{
+				DepartmentGroup group = departmentGroupManager.get((long)Double.parseDouble(departmentGroupId));
+				if(group != null){
+					deptCodes = group.getDepartCodes();
+					deptCodes = deptCodes.replaceAll(";", "','");
+				}
+				if(StringUtils.isNotBlank(deptCodes)){
+					invoicePlans = invoicePlanManager
+							.getAwaitForRecyclingInvoicePlan(supplyRoomType,orgUntiCodes,deptCodes);
+				}
+			}catch(Exception e){
+				
 			}
+		}else{
+			invoicePlans = invoicePlanManager
+					.getAwaitForRecyclingInvoicePlan(supplyRoomType,orgUntiCodes,deptCodes);
 		}
-		List<InvoicePlan> invoicePlans = invoicePlanManager
-				.getAwaitForRecyclingInvoicePlan(supplyRoomType,orgUntiCodes,deptCodes);
 		
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 		if(invoicePlans != null){