Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js
===================================================================
diff -u -r15834 -r15853
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js	(.../qualitymonitoringForm.js)	(revision 15834)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js	(.../qualitymonitoringForm.js)	(revision 15853)
@@ -326,19 +326,19 @@
 				top.Ext.getCmp('scope').setValue(result.data.scope);
 				top.Ext.getCmp('optionAmount').setValue('');
 				var baseInfoPanel = top.Ext.getCmp('baseInfoPanel');
-				if("是" == result.data.isInsertBasket){
+//				if("是" == result.data.isInsertBasket){
 					top.Ext.getCmp("insertBasket").show();
 					top.Ext.getCmp("containerNameItem").show();
 					
 					top.Ext.getCmp('containerName').setVisible(true);   
 					top.Ext.getCmp('containerName').getEl().up('.x-form-item').setDisplayed(true);  
-				}else{
-					top.Ext.getCmp("insertBasket").hide();
-					top.Ext.getCmp("containerNameItem").hide();
-					
-					top.Ext.getCmp('containerName').setVisible(false);   
-					top.Ext.getCmp('containerName').getEl().up('.x-form-item').setDisplayed(false);  
-				}
+//				}else{
+//					top.Ext.getCmp("insertBasket").hide();
+//					top.Ext.getCmp("containerNameItem").hide();
+//					
+//					top.Ext.getCmp('containerName').setVisible(false);   
+//					top.Ext.getCmp('containerName').getEl().up('.x-form-item').setDisplayed(false);  
+//				}
 				var items = new Array();
 				// 如果显示炉次炉号，添加表单
 				if(result.data.showSterNameAndFre == '是'){
@@ -848,6 +848,9 @@
 				if(records.length>0) {
 					top.Ext.getCmp('inspectItem').setValue(records[0].data.inspectItem);
 					addQualityMonitoringItem(records[0].data.inspectItem);
+				}else{
+					// 没有找到监测项
+					top.Ext.getCmp('inspectItem').setValue('');
 				}
 				}
 			}
@@ -1479,14 +1482,14 @@
 						top.Ext.getCmp('recycle').setValue(false);
 						top.Ext.getCmp('repacking').setValue(false);
 					}
-					if(result.data.basketName!=null && result.data.basketName != ""){
+//					if(result.data.basketName!=null && result.data.basketName != ""){
 						top.Ext.getCmp('containerName').setValue(result.data.basketName);
-					}else{
-						top.Ext.getCmp("insertBasket").hide();
-						top.Ext.getCmp("containerNameItem").hide();
-						top.Ext.getCmp('containerName').setVisible(false);   
-						top.Ext.getCmp('containerName').getEl().up('.x-form-item').setDisplayed(false); 
-					}
+//					}else{
+//						top.Ext.getCmp("insertBasket").hide();
+//						top.Ext.getCmp("containerNameItem").hide();
+//						top.Ext.getCmp('containerName').setVisible(false);   
+//						top.Ext.getCmp('containerName').getEl().up('.x-form-item').setDisplayed(false); 
+//					}
 					materialDefinitionStore.baseParams['spell'] = "";
 					materialDefinitionStore.reload();
 					if(result.data.tousseInstance != null){
Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoringconfig/action/QualityMonitoringConfigAction.java
===================================================================
diff -u -r15706 -r15853
--- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoringconfig/action/QualityMonitoringConfigAction.java	(.../QualityMonitoringConfigAction.java)	(revision 15706)
+++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoringconfig/action/QualityMonitoringConfigAction.java	(.../QualityMonitoringConfigAction.java)	(revision 15853)
@@ -269,14 +269,9 @@
 		String jsonStr = "";
 		qualityMonitoringItemsList = qualityMonitoringConfigManager
 				.getQualityMonitoringConfigByOrgcode(type, orgcode,selectAll);
-		QualityMonitoringConfig qm = new QualityMonitoringConfig();
-		qm.setName("无");
 		if(qualityMonitoringItemsList == null)
 		{
 			qualityMonitoringItemsList = new ArrayList<QualityMonitoringConfig>();
-			qualityMonitoringItemsList.add(qm);
-		}else{
-			qualityMonitoringItemsList.add(qm);
 		}
 		JSONArray jsonArray = new JSONArray();
 		if (qualityMonitoringItemsList != null) {
@@ -287,6 +282,10 @@
 					jsonArray.add(obj);
 				}
 			}
+			// 添加'无'选项
+			JSONObject obj = new JSONObject();
+			obj.put("inspectItem","无");
+			jsonArray.add(obj);
 			if(jsonArray.size() > 0){
 				jsonStr = jsonArray.toString();
 			}