Index: ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
===================================================================
diff -u -r12805 -r13894
--- ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java	(.../InitializeDataManagerImpl.java)	(revision 12805)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java	(.../InitializeDataManagerImpl.java)	(revision 13894)
@@ -534,13 +534,16 @@
 	}
 	
 	private void intWareHouseOfOrgUnit(){
+		/*List<OrgUnit> departOrgUnitList = 
+				objectDao.findByProperty(OrgUnit.class.getSimpleName(), "orgType", OrgUnit.ORGUNIT_TYPE_DEPARTMENT.toString());*/
+		//只查询未初始过仓库的科室
 		List<OrgUnit> departOrgUnitList = 
-				objectDao.findByProperty(OrgUnit.class.getSimpleName(), "orgType", OrgUnit.ORGUNIT_TYPE_DEPARTMENT.toString());
+				objectDao.findBySql(OrgUnit.class.getSimpleName(), " where orgType='" + OrgUnit.ORGUNIT_TYPE_DEPARTMENT.toString() + "' and orgUnitCoding not in (select distinct orgUnitCode from WareHouse)");
 		if(CollectionUtils.isNotEmpty(departOrgUnitList)){
 			WareHouse wareHouse = null;
 			for(OrgUnit orgUnit : departOrgUnitList){
 				//如果该科室未创建仓库,则添加一个默认仓库
-				if(CollectionUtils.isEmpty(wareHouseManager.getWareHouseListByOrgUnit(orgUnit))){
+//				if(CollectionUtils.isEmpty(wareHouseManager.getWareHouseListByOrgUnit(orgUnit))){
 					try {
 						wareHouse = new WareHouse();
 						wareHouse.setCreatedUserName("初始化");
@@ -556,7 +559,7 @@
 					} catch (Exception e) {
 						logger.error("初始化"+orgUnit.getName()+"仓库失败:"+e);
 					}
-				}
+//				}
 			}
 		}
 	}