Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
===================================================================
diff -u -r16611 -r16612
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java	(.../SupplyRoomConfigManagerImpl.java)	(revision 16611)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java	(.../SupplyRoomConfigManagerImpl.java)	(revision 16612)
@@ -594,23 +594,23 @@
 	public boolean addServiceAllClinicOrgUnit(String orgUnitCoding,String orgUnitName){
 		String sql = "insert into CssdServiceDepts(cssdOrgUnitCode,cssdOrgUnitName,clinicOrgUnitCode,clinicOrgUnitName,tousseType) "
 				+ "select '" + orgUnitCoding + "','" + orgUnitName + "',orgUnitCoding,name,'" + CssdServiceDepts.TOUSSETYPE_TOUSSE + "' from OrgUnit where orgType=" + OrgUnit.ORGUNIT_TYPE_DEPARTMENT
-				+ "and orgUnitCoding not in (select orgUnitCoding from SupplyRoomConfig where supplyRoomType in ('" + SupplyRoomConfig.SUPPLYROOM_TYPE_1 + "','" + SupplyRoomConfig.SUPPLYROOM_TYPE_2 + "')) "
+				+ "and orgUnitCoding not in (select orgUnitCoding from SupplyRoomConfig where supplyRoomType in (" + SupplyRoomConfig.SUPPLYROOM_TYPE_1 + "," + SupplyRoomConfig.SUPPLYROOM_TYPE_2 + ")) "
 				+ "and orgUnitCoding not in (select clinicOrgUnitCode from CssdServiceDepts where cssdOrgUnitCode='" + orgUnitCoding + "' and clinicOrgUnitCode=OrgUnit.orgUnitCoding and tousseType='" + CssdServiceDepts.TOUSSETYPE_TOUSSE + "');"
 				
 				+ "insert into CssdServiceDepts(cssdOrgUnitCode,cssdOrgUnitName,clinicOrgUnitCode,clinicOrgUnitName,tousseType) "
 				+ "select '" + orgUnitCoding + "','" + orgUnitName + "',orgUnitCoding,name,'" + CssdServiceDepts.TOUSSETYPE_DIPOSABLEGOODS + "' from OrgUnit where orgType=" + OrgUnit.ORGUNIT_TYPE_DEPARTMENT
-				+ "and orgUnitCoding not in (select orgUnitCoding from SupplyRoomConfig where supplyRoomType in ('" + SupplyRoomConfig.SUPPLYROOM_TYPE_1 + "','" + SupplyRoomConfig.SUPPLYROOM_TYPE_2 + "')) "
+				+ "and orgUnitCoding not in (select orgUnitCoding from SupplyRoomConfig where supplyRoomType in (" + SupplyRoomConfig.SUPPLYROOM_TYPE_1 + "," + SupplyRoomConfig.SUPPLYROOM_TYPE_2 + ")) "
 				+ "and orgUnitCoding not in (select clinicOrgUnitCode from CssdServiceDepts where cssdOrgUnitCode='" + orgUnitCoding + "' and clinicOrgUnitCode=OrgUnit.orgUnitCoding and tousseType='" + CssdServiceDepts.TOUSSETYPE_DIPOSABLEGOODS + "');"
 				;
 		if(dbConnection.isOracle()){
 			sql = "insert into CssdServiceDepts(id,cssdOrgUnitCode,cssdOrgUnitName,clinicOrgUnitCode,clinicOrgUnitName,tousseType) "
 					+ "select HIBERNATE_SEQUENCE.nextval,'" + orgUnitCoding + "','" + orgUnitName + "',orgUnitCoding,name,'" + CssdServiceDepts.TOUSSETYPE_TOUSSE + "' from OrgUnit where orgType=" + OrgUnit.ORGUNIT_TYPE_DEPARTMENT
-					+ "and orgUnitCoding not in (select orgUnitCoding from SupplyRoomConfig where supplyRoomType in ('" + SupplyRoomConfig.SUPPLYROOM_TYPE_1 + "','" + SupplyRoomConfig.SUPPLYROOM_TYPE_2 + "')) "
+					+ "and orgUnitCoding not in (select orgUnitCoding from SupplyRoomConfig where supplyRoomType in (" + SupplyRoomConfig.SUPPLYROOM_TYPE_1 + "," + SupplyRoomConfig.SUPPLYROOM_TYPE_2 + ")) "
 					+ "and orgUnitCoding not in (select clinicOrgUnitCode from CssdServiceDepts where cssdOrgUnitCode='" + orgUnitCoding + "' and clinicOrgUnitCode=OrgUnit.orgUnitCoding and tousseType='" + CssdServiceDepts.TOUSSETYPE_TOUSSE + "');"
 					
 					+ "insert into CssdServiceDepts(id,cssdOrgUnitCode,cssdOrgUnitName,clinicOrgUnitCode,clinicOrgUnitName,tousseType) "
 					+ "select HIBERNATE_SEQUENCE.nextval,'" + orgUnitCoding + "','" + orgUnitName + "',orgUnitCoding,name,'" + CssdServiceDepts.TOUSSETYPE_DIPOSABLEGOODS + "' from OrgUnit where orgType=" + OrgUnit.ORGUNIT_TYPE_DEPARTMENT
-					+ "and orgUnitCoding not in (select orgUnitCoding from SupplyRoomConfig where supplyRoomType in ('" + SupplyRoomConfig.SUPPLYROOM_TYPE_1 + "','" + SupplyRoomConfig.SUPPLYROOM_TYPE_2 + "')) "
+					+ "and orgUnitCoding not in (select orgUnitCoding from SupplyRoomConfig where supplyRoomType in (" + SupplyRoomConfig.SUPPLYROOM_TYPE_1 + "," + SupplyRoomConfig.SUPPLYROOM_TYPE_2 + ")) "
 					+ "and orgUnitCoding not in (select clinicOrgUnitCode from CssdServiceDepts where cssdOrgUnitCode='" + orgUnitCoding + "' and clinicOrgUnitCode=OrgUnit.orgUnitCoding and tousseType='" + CssdServiceDepts.TOUSSETYPE_DIPOSABLEGOODS + "');"
 					;
 		}