Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r29564 -r29569
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 29564)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 29569)
@@ -8274,16 +8274,16 @@
 			result = JSONUtil.buildJsonObject(false, "当前申请科室已停用，不能进行申领!");
 			return result;
 		}
-		// 一个科室只能填写一张未打印并且未发货的一次性物品申请单(DGZYY-174)
+		// 一个科室只能填写一张未打印并且未发货的一次性物品申请单(GDSZYY-36)
 		boolean limitDisposableGoodsApply = ConfigUtils.getSystemSetConfigByNameBool("limitDisposableGoodsApply", false);
 		if(limitDisposableGoodsApply){
 			if(!supplyRoomConfigManager.isFirstOrSecondSupplyRoomOrgUnit(orgUnitCode)){
-				String hql = String.format("from %s po where po.deliverStatus in ('%s', '%s') and po.printed in (%s, %s) "
+				String hql = String.format("from %s po where po.deliverStatus = '%s' and po.printed = %s and po.endStatus is null "
 						+ " and po.departCoding = '%s' "
 						+ " and po.type = '%s' order by po.submitTime ",
 						RecyclingApplication.class.getSimpleName(),
-						RecyclingApplication.DELIVERSTATUS_AWAITDELIVER, RecyclingApplication.DELIVERSTATUS_PARTDELIVERED,
-						RecyclingApplication.PRINT_STATUS_UNPRINT, RecyclingApplication.PRINT_STATUS_PART_PRINT,
+						RecyclingApplication.DELIVERSTATUS_AWAITDELIVER,
+						RecyclingApplication.PRINT_STATUS_UNPRINT,
 						orgUnitCode, RecyclingApplication.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM);
 				@SuppressWarnings("unchecked")
 				List<RecyclingApplication> disposabelGoodsAppList = objectDao.findByHql(hql);