Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r40719 -r40721
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 40719)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 40721)
@@ -2880,7 +2880,7 @@
 				+ " where po.orgUnitCoding = '" 
 				+ AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig() 
 				+ "' and (tdc.hidePackingTask is null or tdc.hidePackingTask<>'是') and (tdc.forDisplay=1 or tdc.tousseType='"+ TousseDefinition.PACKAGE_TYPE_SPLIT +"') "
-				+ (StringUtils.isNotBlank(settleAccountsDepartCoding)?" and po.settleAccountsDepartCoding='"+ settleAccountsDepartCoding +"'":StringUtils.EMPTY)
+				+ getQuerySettleAccountsDepartCoding(settleAccountsDepartCoding)
 				+ tousseTypeAndTaskGroupSql;
 		if(StringUtils.isNotBlank(tousseOrDepart)){
 			// sqlServer如果字符串中有"[",进行转译	
@@ -3254,7 +3254,7 @@
 					+ getQuerySettleAccountsDepartCoding(settleAccountsDepartCoding)
 					+ "where po.orgUnitCoding = ct.orgUnitCode "
 					+ "and (td.tousseType not in('"+TousseDefinition.PACKAGE_TYPE_FOREIGN+"','"+TousseDefinition.PACKAGE_TYPE_SPLIT+"','"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"')) "    //外来器械和自定义器械，有专门获取装配任务
-					+ (StringUtils.isNotBlank(settleAccountsDepartCoding)?" and po.settleAccountsDepartCoding='"+ settleAccountsDepartCoding +"'":StringUtils.EMPTY)
+					+ StringUtils.isNotBlank(settleAccountsDepartCoding)
 					+ "and ct.taskGroup = '"+taskGroup+"' and po.orgUnitCoding = '" + orgCode + "' and po.unPackAmount > 0 " + recyclingAmountConfirmSql);
 		}
 		if(DatabaseUtil.isPoIdValid(packingTaskId)){