Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r32911 -r33058
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 32911)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 33058)
@@ -970,6 +970,25 @@
 	Ext.getCmp('repacking').enable();
 }
 
+//SZSDSRMYY-76:获取条码的备注
+function getBarcodeRemark(result){
+	if(result.remark !== ''){
+		var remark = '【' + result.tousseName + '('+ result.barcode +')：' + result.remark + '】';
+		var oldRemark = Ext.getCmp('remark').getValue();
+		if(oldRemark == ''){
+			var resultRemark = '装配备注：' + remark;
+			Ext.getCmp('remark').setValue(resultRemark);
+		}else {
+			if(oldRemark.indexOf('装配备注：') == -1){
+				var resultRemark = '装配备注：' + remark;
+				Ext.getCmp('remark').setValue(oldRemark + resultRemark);
+			}else {
+				Ext.getCmp('remark').setValue(oldRemark + remark);
+			}
+		}
+	}
+}
+
 /**
  * 根据“器械包条码”以及“监测项定义id”，获取器械包名字以及监测环节的责任人.
  * @param tempBarcode				器械包条码
@@ -1021,6 +1040,9 @@
 					}else if(materialDefinitionStore){
 						Ext.getCmp('tousseDefinitionId').setValue('');
 					}
+					if(isScan){
+						getBarcodeRemark(result);
+					}
 					
 					//4、控制“重新回收”和“重新装配”的复选框的是否可用.
 					updateControlStatus();
@@ -2010,6 +2032,7 @@
 										field.setValue("");
 										return;
 									}
+									getBarcodeRemark(result);
 									/* 判断器械包条码是否已经扫描end */
 									Ext.getCmp(idpreKey+"_"+3).setValue(result.tousseName + "(" + field.getValue() + ")");
 									Ext.getCmp(idpreKey2+"_"+1).setValue(field.getValue());//存入隐藏域
@@ -2395,7 +2418,6 @@
 		TousseInstanceTableManager.getTousseInstanceMsgByBarcode(barcode,function(responseText){
 			result = Ext.decode(responseText);
 			if(result.success){
-				
 			}else{
 				result = null;
 				showResultQM("找不到该条码所对应的器械包实例");
@@ -2749,8 +2771,6 @@
 							Ext.getCmp("formDefinitionId").setValue(combo.getValue());
 							Ext.getCmp("name").setValue(combo.getRawValue());
 							addQualityMonitoringItem(combo.getValue(),combo.getRawValue());
-							
-							
 						}
 					}
 				}]
Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
===================================================================
diff -u -r32830 -r33058
--- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js	(.../routineMonitoringView.js)	(revision 32830)
+++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js	(.../routineMonitoringView.js)	(revision 33058)
@@ -811,7 +811,7 @@
 						beforeselect : function(combo, record, index) {
 							if(record.data.name != combo.getValue()){
 								if(top.Ext.getCmp('barcode2').getValue()){
-									getTousseInstanceNameAndResponsiblePerson(top.Ext.getCmp('tempBarcode2').getValue(), combo.getValue(), null,true);
+									getTousseInstanceNameAndResponsiblePerson(top.Ext.getCmp('tempBarcode2').getValue(), combo.getValue(), null,true,false);
 								}
 							}
 						},
@@ -849,7 +849,7 @@
 					listeners : {
 						specialkey : function(field,e){
 							if(e.getKey() == 13){
-								getTousseInstanceNameAndResponsiblePerson(field.getValue(), top.Ext.getCmp('formDefinitionId2').getValue(), materialDefinitionStore,true);
+								getTousseInstanceNameAndResponsiblePerson(field.getValue(), top.Ext.getCmp('formDefinitionId2').getValue(), materialDefinitionStore,true,true);
 								field.setValue('');
 							}
 						}
@@ -1675,7 +1675,7 @@
 					listeners : {
 						specialkey : function(field,e){
 							if(e.getKey() == 13){
-								getTousseInstanceNameAndResponsiblePerson(field.getValue(), top.Ext.getCmp('formDefinitionId').getValue(), materialDefinitionStore,false);
+								getTousseInstanceNameAndResponsiblePerson(field.getValue(), top.Ext.getCmp('formDefinitionId').getValue(), materialDefinitionStore,false,true);
 								field.setValue('');
 							}
 						}
@@ -2175,8 +2175,26 @@
 	top.Ext.getCmp('disabledBarcode').setValue(false);
 }
 
+//SZSDSRMYY-76:获取条码的备注
+function getBarcodeRemark(result){
+	if(result.remark !== ''){
+		var remark = '【' + result.tousseName + '('+ result.barcode +')：' + result.remark + '】';
+		var oldRemark = top.Ext.getCmp('remark').getValue();
+		if(oldRemark == ''){
+			var resultRemark = '装配备注：' + remark;
+			top.Ext.getCmp('remark').setValue(resultRemark);
+		}else {
+			if(oldRemark.indexOf('装配备注：') == -1){
+				var resultRemark = '装配备注：' + remark;
+				top.Ext.getCmp('remark').setValue(oldRemark + resultRemark);
+			}else {
+				top.Ext.getCmp('remark').setValue(oldRemark + remark);
+			}
+		}
+	}
+}
 
-function getTousseInstanceNameAndResponsiblePerson(tempBarcode, qmDefinitionId, materialDefinitionStore,isQMView){
+function getTousseInstanceNameAndResponsiblePerson(tempBarcode, qmDefinitionId, materialDefinitionStore,isQMView,isScan){
 	if(tempBarcode){
 		Ext.Ajax.request({
 			url : WWWROOT + '/disinfectSystem/qualityMonitoringDefinitionAction!getTousseInstanceNameAndResponsiblePerson.do',
@@ -2234,6 +2252,9 @@
 							top.Ext.getCmp('tousseDefinitionId').setValue('');
 						}
 						updateControlStatus();
+						if(isScan){
+							getBarcodeRemark(result);
+						}
 					}
 					
 				}else{