Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r26871 -r26875
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 26871)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 26875)
@@ -996,7 +996,12 @@
 			sql += " and (po.isDisable = '" + Constants.STR_NO + "' or po.isDisable is null) ";
 		}
 		sql = getWhereSqlForAssetsBelong(useAssetsBelong, sql);
-		sql += " order by po.name asc," + DatabaseUtil.getSqlLengthFunctionName(dbConnection) + "(po.name) asc,id desc";
+		// 外来器械申请单器械包名称需要按照名称排序(广东省人民医院GDSRMYY-496)
+		if (StringUtils.equals(TousseDefinition.PACKAGE_TYPE_FOREIGN, tousseType)) {
+			sql += " order by po.name asc," + DatabaseUtil.getSqlLengthFunctionName(dbConnection) + "(po.name) asc,id desc";
+		} else {
+			sql += " order by " + DatabaseUtil.getSqlLengthFunctionName(dbConnection) + "(po.name) asc,id desc";
+		}
 
 		@SuppressWarnings("unchecked")
 		List<TousseDefinition> tousseDefinitions = objectDao.findBySql(