Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/service/QualityMonitoringManagerImpl.java
===================================================================
diff -u -r14754 -r14925
--- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/service/QualityMonitoringManagerImpl.java	(.../QualityMonitoringManagerImpl.java)	(revision 14754)
+++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/service/QualityMonitoringManagerImpl.java	(.../QualityMonitoringManagerImpl.java)	(revision 14925)
@@ -344,6 +344,10 @@
 						deleteQualityMonitoringById(qualityMonitoringId);
 					}
 				} else {
+					// 没有录入材料名字，只有器械包名字
+					if(qualityMonitoring.getAmount() == null ||qualityMonitoring.getAmount() == 0){
+						qualityMonitoring.setAmount(1);
+					}
 					saveOrUpdate(qualityMonitoring);
 				}
 			} else {
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r14888 -r14925
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 14888)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 14925)
@@ -2055,10 +2055,11 @@
 								MonitoringItemBean bean = new MonitoringItemBean();
 								bean.setAmount(qualityMonitoring.getAmount());
 								bean.setDateTime(dateStr);
+								// 数量默认是材料的
 								String goodsName = qualityMonitoring
-										.getTousseName();
+										.getMaterial();
 								if (StringUtils.isBlank(goodsName)) {
-									goodsName = qualityMonitoring.getMaterial();
+									goodsName = qualityMonitoring.getTousseName();
 								}
 								bean.setGoodsName(goodsName + "%&" + qualityMonitoring.getId());
 								bean.setOrderNumber(qualityMonitoringItem
Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js
===================================================================
diff -u -r14917 -r14925
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js	(.../qualitymonitoringForm.js)	(revision 14917)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js	(.../qualitymonitoringForm.js)	(revision 14925)
@@ -1255,6 +1255,23 @@
 					if(result.data.tousseInstance != null){
 						top.Ext.getCmp('tousseInstanceId').setValue(result.data.tousseInstance.id);
 					}
+					if("材料" == result.data.scope){
+						top.Ext.getCmp('tempBarcode').setVisible(false);   
+						top.Ext.getCmp('tempBarcode').getEl().up('.x-form-item').setDisplayed(false);
+						top.Ext.getCmp('recycle').setVisible(false);   
+						top.Ext.getCmp('recycle').getEl().up('.x-form-item').setDisplayed(false);
+						top.Ext.getCmp('tousseName').setVisible(false);   
+						top.Ext.getCmp('tousseName').getEl().up('.x-form-item').setDisplayed(false);
+						top.Ext.getCmp('repacking').setVisible(false);   
+						top.Ext.getCmp('repacking').getEl().up('.x-form-item').setDisplayed(false);
+					}else if("器械包" == result.data.scope){
+						top.Ext.getCmp('material').setVisible(false);   
+						top.Ext.getCmp('material').getEl().up('.x-form-item').setDisplayed(false);
+						top.Ext.getCmp('amount').setVisible(false);   
+						top.Ext.getCmp('amount').getEl().up('.x-form-item').setDisplayed(false);
+					}
+					top.Ext.getCmp('addExtractCheckTousse').setVisible(false);
+					top.Ext.getCmp('addExtractCheckMaterial').setVisible(false);
 					top.Ext.getCmp('remark').setValue(result.data.remark);
 					top.Ext.getCmp('optionAmount').setValue('');
 					var items = new Array();