Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
===================================================================
diff -u -r12862 -r12887
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java	(.../DiposableGoodsManager.java)	(revision 12862)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java	(.../DiposableGoodsManager.java)	(revision 12887)
@@ -54,7 +54,7 @@
 	 * @param wareHouseId 科室的id,可以为null
 	 * @return
 	 */
-	public JSONObject searchDisposableGoodsList(String simpleSpell, String allItems,String handleDepartCode);
+	public JSONObject searchDisposableGoodsList(String simpleSpell, String allItems,String handleDepartCode,boolean showExternalCodeOfDisposableGoods);
 
 	public JSONObject searchMaterialAndDiposableGoods(String simpleSpell);
 
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
===================================================================
diff -u -r12877 -r12887
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java	(.../DiposableGoodsAction.java)	(revision 12877)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java	(.../DiposableGoodsAction.java)	(revision 12887)
@@ -414,7 +414,7 @@
 					handleDepartCode = warehouse.getOrgUnitCode();
 				}
 				JSONObject json = diposableGoodsManager.searchDisposableGoodsList(
-						spell, allItems,handleDepartCode);
+						spell, allItems,handleDepartCode,false);
 				HttpServletResponse response = StrutsParamUtils.getResponse();
 				response.setCharacterEncoding("UTF-8");
 				PrintWriter out = response.getWriter();
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
===================================================================
diff -u -r12871 -r12887
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 12871)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 12887)
@@ -571,22 +571,24 @@
 	 */
 	@SuppressWarnings("unchecked")
 	public JSONObject searchDisposableGoodsList(String simpleSpell, String allItems,
-			String handleDepartCode) {
+			String handleDepartCode,boolean showExternalCodeOfDisposableGoods) {
 		String sql = buildGetDisposableGoodsSql(simpleSpell, allItems);
 		
 		/*if(DatabaseUtil.isPoIdValid(wareHouseId)){
 			sql += " and po.wareHouseID = " + wareHouseId;
 		}*/
 		List<Map<String, Object>> mapList = getDisposableGoodsListInternal(
-				handleDepartCode, sql,true);
+				handleDepartCode, sql,true,showExternalCodeOfDisposableGoods);
+		
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put("totalCount", mapList.size());
+		
 		map.put("data", mapList);
 		return JSONObject.fromObject(map);
 	}
 
 	private List<Map<String, Object>> getDisposableGoodsListInternal(
-			String handleDepartCode, String sql,boolean showReferencePrice) {
+			String handleDepartCode, String sql,boolean showReferencePrice,boolean showExternalCodeOfDisposableGoods) {
 		@SuppressWarnings("unchecked")
 		List<DisposableGoods> disposableGoodsList = objectDao.findBySql(
 				DisposableGoods.class.getSimpleName(), sql);
@@ -612,28 +614,45 @@
 		
 		for (DisposableGoods disposableGoods : disposableGoodsList) {
 			Map<String,Object> item = buildDisposableGoodsPropertyMap(disposableGoods,goodsStocks,floatPercent,
-					showReferencePrice);
+					showReferencePrice,showExternalCodeOfDisposableGoods);
 			if(item != null){
 				mapList.add(item);
 			}
 		}
+		
+		if (showExternalCodeOfDisposableGoods){
+			Collections.sort(mapList, new Comparator<Map<String, Object>>() {
+				@Override
+				public int compare(Map<String, Object> o1,
+						Map<String, Object> o2) {
+					// 根据外部编码排序
+					int result = ObjectUtils.compare(o1.get("externalCode").toString(), o2.get("externalCode").toString());
+					return result;
+				}
+			});
+		}
+		
 		return mapList;
 	}
 
 	private Map<String,Object> buildDisposableGoodsPropertyMap(DisposableGoods disposableGoods,
-			List<DisposableGoodsStock> goodsStocks,double floatPercent,boolean showReferencePrice) {
+			List<DisposableGoodsStock> goodsStocks,double floatPercent,boolean showReferencePrice,boolean showExternalCodeOfDisposableGoods) {
 		if(disposableGoods == null)
 			return null;
 		Map<String,Object> temp = new HashMap<String,Object>();
 		
 		String goodsName = DisposableGoodsUtils.getDisposableGoodsFullName(disposableGoods.getName(), 
 				disposableGoods.getSpecification()) ;
+		String externalCode = disposableGoods.getExternalCode();
+		if (externalCode == null){
+			externalCode = "";
+		}
 
 		temp.put("id", disposableGoods.getId());
 		temp.put("type", "一次性物品");
 		temp.put("name", goodsName);
 		temp.put("spelling", disposableGoods.getSpelling());
-		temp.put("externalCode", disposableGoods.getExternalCode());
+		temp.put("externalCode", externalCode);
 		temp.put("minApplyAmount", disposableGoods.getMinApplyAmount());
 		temp.put("unit", StringTools.getDefaultString(disposableGoods.getUnit()));
 		temp.put("tousseType", "一次性物品");
@@ -663,7 +682,16 @@
 				}
 			}
 		}
+		if (showExternalCodeOfDisposableGoods){
+			if (StringUtils.isNotBlank(externalCode)){
+				displayName = "<font color='blue'>" + externalCode + ":</font>" + displayName;
+			}
+			
+		}
 		temp.put("displayName", displayName);
+		
+		
+		
 		return temp;
 	}
 
@@ -772,7 +800,7 @@
 	public List<Map<String, Object>> getDisposableGoodsList(String sql,
 			boolean showReferencePrice,boolean showExternalCodeOfDisposableGoods, String handleDepartCode) {
 		return this.getDisposableGoodsListInternal(handleDepartCode, sql,
-				showReferencePrice);
+				showReferencePrice,showExternalCodeOfDisposableGoods);
 	}
 	
 	@SuppressWarnings("unchecked")