Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js
===================================================================
diff -u -r14440 -r14446
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js	(.../qualitymonitoringForm.js)	(revision 14440)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js	(.../qualitymonitoringForm.js)	(revision 14446)
@@ -332,6 +332,14 @@
 	}else{
 		enableRecycleAndRepacking();
 	}
+	var toussedefRecycling = top.Ext.getCmp('tousseDefRecycling').getValue();
+	if(tousseType == '敷料包' || toussedefRecycling == '否'){
+		//敷料包或者是不回收的包，不能选择重新回收,只能选重新装配
+		top.Ext.getCmp('recycle').setValue(false);
+		top.Ext.getCmp('recycle').disable();
+	}else{
+		top.Ext.getCmp('recycle').enable();
+	}
 }
 //重置重新回收和重新装配
 function resetRecycleAndRepacking(){
@@ -359,6 +367,7 @@
 					top.Ext.getCmp('barcode').setValue(tempBarcode);
 					top.Ext.getCmp('tousseInstanceId').setValue(result.tousseInstanceId);
 					top.Ext.getCmp('tousseType').setValue(result.tousseType);
+					top.Ext.getCmp('tousseDefRecycling').setValue(result.isRecycle);
 					top.Ext.getCmp('responsiblePerson').setValue(result.responsiblePerson);
 					if(result.tousseDefinitionId){
 						top.Ext.getCmp('tousseDefinitionId').setValue(result.tousseDefinitionId);
@@ -544,6 +553,10 @@
 				id:'isRecycle'
 			},{
 				xtype:'hidden',
+				name:'tousseDefRecycling',
+				id:'tousseDefRecycling'
+			},{
+				xtype:'hidden',
 				name:'isRepacking',
 				id:'isRepacking'
 			},{
Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoringconfig/action/QualityMonitoringConfigAction.java
===================================================================
diff -u -r14435 -r14446
--- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoringconfig/action/QualityMonitoringConfigAction.java	(.../QualityMonitoringConfigAction.java)	(revision 14435)
+++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoringconfig/action/QualityMonitoringConfigAction.java	(.../QualityMonitoringConfigAction.java)	(revision 14446)
@@ -16,6 +16,7 @@
 import org.apache.struts2.convention.annotation.Namespace;
 import org.apache.struts2.convention.annotation.ParentPackage;
 
+import com.forgon.Constants;
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
@@ -25,7 +26,9 @@
 import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringItem;
 import com.forgon.disinfectsystem.qualitymonitoringmanager.qualitymonitoringconfig.service.QualityMonitoringConfigManager;
 import com.forgon.tools.StrutsParamUtils;
+import com.forgon.tools.StrutsResponseUtils;
 import com.forgon.tools.hibernate.ObjectDao;
+import com.forgon.tools.json.JSONUtil;
 import com.opensymphony.xwork2.ModelDriven;
 import com.opensymphony.xwork2.Preparable;
 
@@ -242,8 +245,7 @@
 		String barcode = StrutsParamUtils.getPraramValue("barcode", "");
 		String monitoringItem = StrutsParamUtils.getPraramValue(
 				"monitoringItem", "");
-		JSONObject obj = new JSONObject();
-		obj.put("success", false);
+		JSONObject obj = JSONUtil.buildJsonObject(false);
 		if (StringUtils.isNotBlank(barcode)
 				&& StringUtils.isNotBlank(monitoringItem)) {
 			TousseInstance tousseInstance = (TousseInstance) objectDao.getByProperty(
@@ -301,11 +303,13 @@
 					}
 				}
 				String tousseType = TousseDefinition.PACKAGE_TYPE_INSIDE;
+				String isRecycle = Constants.STR_NO;
 				Long tousseDefinitionId = null;
 				if (tousseInstance.getTousseDefinition() != null) {
 					tousseDefinitionId = tousseInstance.getTousseDefinition()
 							.getId();
 					tousseType = tousseInstance.getTousseDefinition().getTousseType();
+					isRecycle = tousseInstance.getTousseDefinition().getIsRecycling();
 				}
 
 				String tousseName = tousseInstance.getTousseName();
@@ -314,21 +318,15 @@
 				obj.put("tousseInstanceId", tousseInstance.getId());
 				obj.put("tousseName", tousseName);
 				obj.put("tousseType", tousseType);
+				obj.put("isRecycle", isRecycle);
 				obj.put("responsiblePerson", responsiblePerson);
 				obj.put("tousseDefinitionId", tousseDefinitionId);
 				obj.put("success", true);
 			}
 		}
 
-		HttpServletResponse res = StrutsParamUtils.getResponse();
-		res.setCharacterEncoding("UTF-8");
+		StrutsResponseUtils.output(obj);
 
-		try {
-			res.getWriter().print(obj.toString());
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-
 		return null;
 	}