Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r33172 -r33222
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 33172)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 33222)
@@ -1585,7 +1585,7 @@
 				_defaultDateJsonValueProcessor3);
 		final String[] retainPropertys = { "id", "tousseDefinition","itemDefinition",
 				"tousseName", "barcode", "validUntil", "sterilingType","sterilingMode",
-				"orgUnitCoding", "orgUnitName","sterilizerPosition","actualUsed","operator","status","hasReceived" };
+				"orgUnitCoding", "orgUnitName","sterilizerPosition","actualUsed","operator","status","hasReceived","depart","departCoding" };
 		PropertyFilter filter = new PropertyFilter() {
 			@Override
 			public boolean apply(Object source, String name, Object value) {
@@ -3571,17 +3571,28 @@
 			}
 		};
 		config.setJsonPropertyFilter(propertyFilter);
-		String status = params.optString("status");
-		List<String> statusList = null;
-		if(StringUtils.isNotBlank(status) && status.indexOf(Constants.STR_ALL) == -1){
-			String[] statusArray = StringUtils.split(status,",");
-			statusList = Arrays.asList(statusArray);
+		//接收状态
+		String receiveStatus = params.optString("receiveStatus");
+		List<String> receiveStatusList = null;
+		if(StringUtils.isNotBlank(receiveStatus) && receiveStatus.indexOf(Constants.STR_ALL) == -1){
+			String[] statusArray = StringUtils.split(receiveStatus,",");
+			receiveStatusList = Arrays.asList(statusArray);
 		}
 		String currentOrgUnitCode = AcegiHelper.getCurrentOrgUnitCode();
 		String condition = "where (po.handleDepartCoding='"+ currentOrgUnitCode +"' or po.departCoding='"+ currentOrgUnitCode +"' and po.isConvertPackingRecord='"+ Constants.STR_YES +"') ";
-		if(CollectionUtils.isNotEmpty(statusList)){
-			condition += " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("po.deliverStatus", statusList);
+		if(CollectionUtils.isNotEmpty(receiveStatusList)){
+			condition += " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("po.receiveStatus", receiveStatusList);
 		}
+		//发货状态
+		String deliverStatus = params.optString("deliverStatus");
+		List<String> deliverStatusList = null;
+		if(StringUtils.isNotBlank(deliverStatus) && deliverStatus.indexOf(Constants.STR_ALL) == -1){
+			String[] statusArray = StringUtils.split(deliverStatus,",");
+			deliverStatusList = Arrays.asList(statusArray);
+		}
+		if(CollectionUtils.isNotEmpty(deliverStatusList)){
+			condition += " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("po.deliverStatus", deliverStatusList);
+		}
 		String departCode = params.optString("departCode");
 		if(StringUtils.isNotBlank(departCode)){
 			condition += " and po.departCoding='"+ departCode +"'";