Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
===================================================================
diff -u -r15886 -r15954
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java	(.../ForeignProxyDisinfectionManagerImpl.java)	(revision 15886)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java	(.../ForeignProxyDisinfectionManagerImpl.java)	(revision 15954)
@@ -332,7 +332,12 @@
 		}
 		Collections.sort(tousseList,TousseInstance.TousseInstanceBarcodeComparator);
 		JSONArray tousseInstancesPrintInfo = buildTousseInstancesPrintInfo(tousseList, foreignProxyDisinfection);
-		jsonObj.put("tousseList", tousseInstancesPrintInfo);
+		if(tousseInstancesPrintInfo.size() > 0){
+			jsonObj.put("tousseList", tousseInstancesPrintInfo);
+		}else{
+			jsonObj.put("msg", "没有要打印的标签!");
+		}
+		
 	}
 	@Override
 	public void deleteForeignProxyDisinfection(
@@ -883,6 +888,10 @@
 	private JSONArray buildTousseInstancesPrintInfo(List<TousseInstance> tousseInstances,ForeignProxyDisinfection foreignProxyDisinfection){
 		JSONArray printParamList = new JSONArray();
 		for (TousseInstance tousseInstance : tousseInstances) {
+			TousseDefinition tousseDefinition = tousseInstance.getTousseDefinition();
+			if(tousseDefinition != null && !StringUtils.equals(TousseDefinition.STR_YES, tousseDefinition.getIsPrint())){
+				continue;
+			}
 			JSONObject obj = new JSONObject();
 			obj.put("barcode", tousseInstance.getBarcode());
 			obj.put("tousseName", tousseInstance.getTousseName());
@@ -1107,7 +1116,9 @@
 			if(foreignProxyDisinfections != null){
 				for (ForeignProxyDisinfection foreignProxyDisinfection : foreignProxyDisinfections) {
 					JSONArray tousseInstancesPrintInfo = buildTousseInstancesPrintInfo(foreignProxyDisinfection.getTousseInstanceList(objectDao), foreignProxyDisinfection);
-					tousseList.addAll(tousseInstancesPrintInfo);
+					if(tousseInstancesPrintInfo.size() > 0){
+						tousseList.addAll(tousseInstancesPrintInfo);
+					}
 				}
 			}
 		}
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java
===================================================================
diff -u -r14773 -r15954
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java	(.../ForeignProxyDisinfectionAction.java)	(revision 14773)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java	(.../ForeignProxyDisinfectionAction.java)	(revision 15954)
@@ -164,7 +164,11 @@
 					if(retForeignProxyDisinfection!=null && retForeignProxyDisinfection.hasPacked()){
 						params.put("id", retForeignProxyDisinfection.getId());
 						foreignProxyDisinfectionManager.getPrintInfo(jsonObj,params);
-						jsonObj.put("success", true);
+						if(jsonObj.containsKey("tousseList")){
+							jsonObj.put("success", true);
+						}else{
+							jsonObj.put("success", false);
+						}
 					}
 				} catch (Exception e) {
 					e.printStackTrace();
@@ -195,8 +199,12 @@
 		jsonObj.put("success", false);
 		try {
 			JSONArray tousseList = foreignProxyDisinfectionManager.getForeignProxyDisinfectionTousseInstancesByIds(ids);
-			jsonObj.put("success", true);
-			jsonObj.put("tousseList", tousseList);
+			if(tousseList.size() > 0){
+				jsonObj.put("tousseList", tousseList);
+				jsonObj.put("success", true);
+			}else{
+				jsonObj.put("msg", "没有要打印的标签!");
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 			jsonObj.put("success", false);