Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/StorageLocationManager.java
===================================================================
diff -u -r41553 -r41555
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/StorageLocationManager.java	(.../StorageLocationManager.java)	(revision 41553)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/StorageLocationManager.java	(.../StorageLocationManager.java)	(revision 41555)
@@ -2,6 +2,8 @@
 
 import java.util.List;
 
+import net.sf.json.JSONObject;
+
 import com.forgon.disinfectsystem.basedatamanager.warehouse.vo.StorageLocationVo;
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.StorageLocation;
 
@@ -42,6 +44,15 @@
 	 * @return 库位Vo
 	 */
 	public List<StorageLocationVo> findAllStorageLocationByKeyword(String keyword, String orgUnitCode, boolean searchLeafStorageLocation);
+	
+	/**
+	 * 根据关键词模糊查找库位
+	 * @param keyword 关键字
+	 * @param orgUnitCode 库位所属科室编码
+	 * @param searchLeafStorageLocation 只查询叶子节点的库位
+	 * @return 库位json
+	 */
+	public JSONObject findAllStorageLocationJsonByKeyword(String keyword, String orgUnitCode, boolean searchLeafStorageLocation);
 
 	/**
 	 * 根据父节点id查找库位
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/StorageLocationAction.java
===================================================================
diff -u -r41553 -r41555
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/StorageLocationAction.java	(.../StorageLocationAction.java)	(revision 41553)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/StorageLocationAction.java	(.../StorageLocationAction.java)	(revision 41555)
@@ -25,7 +25,6 @@
 import com.forgon.directory.model.OrgUnit;
 import com.forgon.disinfectsystem.basedatamanager.warehouse.service.StorageLocationManager;
 import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
-import com.forgon.disinfectsystem.basedatamanager.warehouse.vo.StorageLocationVo;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.StorageLocation;
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
@@ -112,14 +111,7 @@
 		String orgUnitCode = StrutsParamUtils.getPraramValue("orgUnitCode", "");
 		//只查询叶子节点的库位
 		boolean searchLeafStorageLocation = StrutsParamUtils.getBoolPraramValue("searchLeafStorageLocation", false);
-		List<StorageLocationVo> list = storageLocationManager.findAllStorageLocationByKeyword(keyword, orgUnitCode, searchLeafStorageLocation);
-		JSONArray jsonArr = new JSONArray();
-		if(CollectionUtils.isNotEmpty(list)){
-			jsonArr = JSONArray.fromObject(list);
-		}
-		JSONObject jsonObj = new JSONObject();
-		jsonObj.put("totalCount", jsonArr.size());
-		jsonObj.put("data", jsonArr.toString());
+		JSONObject jsonObj = storageLocationManager.findAllStorageLocationJsonByKeyword(keyword, orgUnitCode, searchLeafStorageLocation);
 		StrutsResponseUtils.output(jsonObj);
 	}
 	
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/StorageLocationManagerImpl.java
===================================================================
diff -u -r41553 -r41555
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/StorageLocationManagerImpl.java	(.../StorageLocationManagerImpl.java)	(revision 41553)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/StorageLocationManagerImpl.java	(.../StorageLocationManagerImpl.java)	(revision 41555)
@@ -711,6 +711,19 @@
 		}
 		return objectDao.findByHql(hql);
 	}
+
+	@Override
+	public JSONObject findAllStorageLocationJsonByKeyword(String keyword, String orgUnitCode, boolean searchLeafStorageLocation) {
+		List<StorageLocationVo> storageLocationVoList = this.findAllStorageLocationByKeyword(keyword, orgUnitCode, searchLeafStorageLocation);
+		JSONArray jsonArr = new JSONArray();
+		if(CollectionUtils.isNotEmpty(storageLocationVoList)){
+			jsonArr = JSONArray.fromObject(storageLocationVoList);
+		}
+		JSONObject jsonObj = new JSONObject();
+		jsonObj.put("totalCount", jsonArr.size());
+		jsonObj.put("data", jsonArr.toString());
+		return jsonObj;
+	}
 	
 
 }