Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cssdservicedepts/action/CssdServiceDeptsAction.java
===================================================================
diff -u -r12848 -r13834
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cssdservicedepts/action/CssdServiceDeptsAction.java	(.../CssdServiceDeptsAction.java)	(revision 12848)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cssdservicedepts/action/CssdServiceDeptsAction.java	(.../CssdServiceDeptsAction.java)	(revision 13834)
@@ -83,26 +83,26 @@
 	 * @return
 	 */
 	public void getClinicOrgUnits() {
-		SupplyRoomConfig firstSupplyRoom = supplyRoomConfigManager
-				.getFirstSupplyRoomConfig();
-		List<SupplyRoomConfig> secondSupplyRooms = supplyRoomConfigManager
-				.getSecondSupplyRoomList();
-		List<String> cssdOrgUnitCodeList = new ArrayList<String>();
-		if (firstSupplyRoom != null) {
-			cssdOrgUnitCodeList.add("'" + firstSupplyRoom.getOrgUnitCoding() + "'");
-		}
-
-		if (secondSupplyRooms != null) {
-			for (SupplyRoomConfig config : secondSupplyRooms) {
-				cssdOrgUnitCodeList.add("'" + config.getOrgUnitCoding() + "'");
-			}
-		}
+//		SupplyRoomConfig firstSupplyRoom = supplyRoomConfigManager
+//				.getFirstSupplyRoomConfig();
+//		List<SupplyRoomConfig> secondSupplyRooms = supplyRoomConfigManager
+//				.getSecondSupplyRoomList();
+//		List<String> cssdOrgUnitCodeList = new ArrayList<String>();
+//		if (firstSupplyRoom != null) {
+//			cssdOrgUnitCodeList.add("'" + firstSupplyRoom.getOrgUnitCoding() + "'");
+//		}
+//
+//		if (secondSupplyRooms != null) {
+//			for (SupplyRoomConfig config : secondSupplyRooms) {
+//				cssdOrgUnitCodeList.add("'" + config.getOrgUnitCoding() + "'");
+//			}
+//		}
 		
 		//科室类型为部门且不为一、二级供应室
 		String sql = " where orgType = " + OrgUnit.ORGUNIT_TYPE_DEPARTMENT;
-		if(CollectionUtils.isNotEmpty(cssdOrgUnitCodeList)){
+		/*if(CollectionUtils.isNotEmpty(cssdOrgUnitCodeList)){
 			sql += " and orgUnitCoding not in (" + StringUtils.join(cssdOrgUnitCodeList , ",") + ")";
-		}
+		}*/
 		
 		if(spell == null){
 			spell = "";