Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebService.java
===================================================================
diff -u -r22966 -r28922
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebService.java	(.../ForeignTousseWebService.java)	(revision 22966)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebService.java	(.../ForeignTousseWebService.java)	(revision 28922)
@@ -20,6 +20,23 @@
 		<return>
 	 */
 	public String findForeignTousseInfo();
+	
+	/**
+	 * 获取所有供应商
+	 * @return
+	 */
+	public String findAllSupplier();
+	
+	/**
+	 * 根据厂商查询外来器械包的信息(含供应商名称、联系人、外来器械包信息等)(供应商名称为空则返回所有供应商的外来器械包)
+	 * @return xml格式的字符串文本,格式为:
+	 * <return>
+	  	<result>1</result>     //1表示成功,0为不成功
+		<message></message>    //消息
+		<items><item>...</item><item>...</item></items> //具体的数据内容
+		<return>
+	 */
+	public String findForeignTousseInfoBySupplierName(String supplierName);
 
 	/**
 	 * 查询外来器械包的信息(含供应商名称、联系人、外来器械包信息等)
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceImpl.java
===================================================================
diff -u -r26634 -r28922
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceImpl.java	(.../ForeignTousseWebServiceImpl.java)	(revision 26634)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceImpl.java	(.../ForeignTousseWebServiceImpl.java)	(revision 28922)
@@ -2,6 +2,7 @@
 
 import java.sql.ResultSet;
 import java.util.List;
+import java.util.Map;
 
 import javax.jws.WebService;
 
@@ -419,4 +420,33 @@
 		return xmlSerializer.write(returnJSONObject);
 	}
 
+	@Override
+	public String findForeignTousseInfoBySupplierName(String supplierName) {
+		appLogManager.saveLog(AcegiHelper.getLoginUser(), "调用接口" , Log.TYPE_QUERY, "调用外来器械包接口的findForeignTousseInfoBySupplierName方法");
+		logger.debug("调用外来器械包接口的findForeignTousseInfo方法");
+		JSONObject returnJSONObject = findForeignTousseInfoData(supplierName);
+		logger.debug("调用外来器械包接口的findForeignTousseInfo方法 json result=" + returnJSONObject);
+		appLogManager.saveLog(AcegiHelper.getLoginUser(), "调用接口" , Log.TYPE_QUERY, "调用外来器械包接口的findForeignTousseInfoBySupplierName方法返回结果result=" + returnJSONObject);
+		return returnJSONObject.toString();
+	}
+
+	@Override
+	public String findAllSupplier() {
+		appLogManager.saveLog(AcegiHelper.getLoginUser(), "调用接口" , Log.TYPE_QUERY, "调用外来器械包接口的findAllSupplier方法");
+		List<Map<String, Object>> mapList = supplierManager.searchSupplier("", Supplier.SUPPLIER_TYPE_RENTTOUSSE, "");
+		JSONObject jsonObject = new JSONObject();
+		if(CollectionUtils.isEmpty(mapList)){
+			jsonObject.put("result", 1);
+			jsonObject.put("message", "");
+			jsonObject.put("items", new JSONArray());
+			return jsonObject.toString();
+		}
+		JSONArray jsonArray = JSONArray.fromObject(mapList);
+		jsonObject.put("result", 1);
+		jsonObject.put("message", "");
+		jsonObject.put("items", jsonArray);
+		appLogManager.saveLog(AcegiHelper.getLoginUser(), "调用接口" , Log.TYPE_QUERY, "调用外来器械包接口的findAllSupplier方法返回结果result=" + jsonObject);
+		return jsonObject.toString();
+	}
+
 }