Index: ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/RecyclingApplicationManagerTests.java
===================================================================
diff -u -r20089 -r20458
--- ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/RecyclingApplicationManagerTests.java	(.../RecyclingApplicationManagerTests.java)	(revision 20089)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/RecyclingApplicationManagerTests.java	(.../RecyclingApplicationManagerTests.java)	(revision 20458)
@@ -207,6 +207,7 @@
 	 */
 	@Test
 	public void testSyncHrpDisposableGoodsInvoicePlan() {
+		initCSSDData();
 		String remark = "备注";
 		Date applicationTime = new Date();
 		String applicant = "admin";
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
===================================================================
diff -u -r20410 -r20458
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 20410)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 20458)
@@ -1805,11 +1805,11 @@
 					json = tousseDefinitionManager
 							.searchTousseOrDiposableGoods(spell, false);
 
-				}else if("器械包和外来器械包".equals(type.trim())){
+				}/*else if("器械包和外来器械包".equals(type.trim())){
 					// 根据拼音码、五笔码获取器械包(内部器械包和自定义器械包、外来器械包)和一次性物品NAME和ID
 					json = tousseDefinitionManager
 							.searchTousseAndForeignTousseDiposableGoods(spell);
-				}else {
+				}*/else {
 					// 根据拼音码、五笔码获取器械包(内部器械包和自定义器械包)和一次性物品NAME和ID
 					json = tousseDefinitionManager
 							.searchTousseAndDiposableGoods(spell);
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r20437 -r20458
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 20437)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 20458)
@@ -901,8 +901,7 @@
 	 */
 	@Override
 	public JSONObject searchTousseAndDiposableGoods(String searchString) {
-		List<Map<String, Object>> mapList = searchTousseOrDiposableGoodsBySpellAndWbCode(
-				searchString, true, true, false,false,false,"1","0",false,false,null);
+		List<Map<String, Object>> mapList = searchTousseByKeywordAndTousseTypeArr(searchString, null, false, true);
 		mapList.addAll(searchTousseOrDiposableGoodsBySpellAndWbCode(
 				searchString, false, true, false,false,false,"1","0",false,false,null));