Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManagerImpl.java
===================================================================
diff -u -r23824 -r27785
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManagerImpl.java	(.../DiposableGoodBatchStockManagerImpl.java)	(revision 23824)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManagerImpl.java	(.../DiposableGoodBatchStockManagerImpl.java)	(revision 27785)
@@ -228,7 +228,7 @@
 
 		String validUntilStr = String.format(" ( %s > %s) ", "po.expDate", validUntilSql);
 		String storageStr = "i.amount>0";
-		String orderBy = "order by i.id";
+		String orderBy = "order by po.expDate";
 		String wareHouseStr = SqlUtils.getNonStringFieldInLargeCollectionsPredicate("i.warehouseID", wareHouseManager.getWareHouseIdsByUnitCode(orgUnitCoding));
 		String sqlformat = "select distinct po from %s po inner join fetch po.identifications i where %s and %s and (%s) and ( po.disposableGoodsId = %d) %s ";
 		String queryString = String.format(sqlformat,DisposableGoodsBatchStock.class.getSimpleName(),validUntilStr,storageStr,
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManager.java
===================================================================
diff -u -r25609 -r27785
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManager.java	(.../DiposableGoodBatchStockManager.java)	(revision 25609)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManager.java	(.../DiposableGoodBatchStockManager.java)	(revision 27785)
@@ -75,7 +75,7 @@
 	
 	public List<DisposableGoodsBatchStock> getDisposableGoodsBatchStockBySql(String sql);
 	/**
-	 * 根据一次性物品id和科室编码，获取批次库存。首先获取库存数量大于0的,此时取最早入库的批次。如果没有库存数据大于0的,则取最后一次入库的批次。
+	 * 根据一次性物品id和科室编码，获取批次库存。首先获取库存数量大于0的,此时取最早入库的批次(BJDXZLYY-13改为取失效期先到的批次)。如果没有库存数据大于0的,则取最后一次入库的批次。
 	 * 如果根本没有入过库,则返回null
 	 * @param disposableGoodsId
 	 * @param orgUnitCoding