Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
===================================================================
diff -u -r16460 -r16713
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 16460)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 16713)
@@ -811,8 +811,68 @@
 			}]
 		})]
     });
-
     
+    tabsItemArr.push({
+        title: '<strong>质量记录</strong>',
+        layout:'fit',
+    	items:[new top.Ext.FormPanel({
+			frame : true,
+			labelSeparator : '：',
+			bodyStyle : 'padding:5px 5px 0px 50px',
+			labelAlign : 'right',
+			items : [{
+				layout : 'column',
+				autoHeight : true,
+				items : [{
+					layout : 'form',
+					columnWidth : .5,
+					cls:'edit-part2-labelwidth',
+					items : [{
+						id : 'createUserName',
+						name : 'createUserName',
+						xtype : 'textfield',
+						fieldLabel : '登记人',
+						anchor : '100%',
+						readOnly : true,
+						cls : 'fieldReadOnlyNoRemove'
+					}]
+				},{
+					layout : 'form',
+					columnWidth : .5,
+					cls:'edit-part2-labelwidth',
+					items : [{
+						id : 'createDate',
+						name : 'createDate',
+						xtype : 'textfield',
+						fieldLabel : '登记时间',
+						anchor : '100%',
+						readOnly : true,
+						cls : 'fieldReadOnlyNoRemove'
+					}]
+				},{
+					layout : 'form',
+					columnWidth : .5,
+					cls:'edit-part2-labelwidth',
+					items : [{
+						id : 'inspectName',
+						name : 'inspectName',
+						xtype : 'textfield',
+						fieldLabel : '监测项名称',
+						anchor : '100%',
+						readOnly : true,
+						cls : 'fieldReadOnlyNoRemove'
+					}]
+				}]
+			}],
+			buttons : [{
+				text : '取消',
+				handler : function() {
+					tousseInstanceWindow.close();
+				}
+			}]
+		})]
+    });
+    
 	var tabs = new top.Ext.TabPanel({
         activeTab: 0,
         width:600,
@@ -926,6 +986,9 @@
 				top.Ext.getCmp('reUser').setValue(result.reUser);
 				top.Ext.getCmp('reType').setValue(result.reType);
 				top.Ext.getCmp('reTime').setValue(result.reTime);
+				top.Ext.getCmp('createUserName').setValue(result.createUserName);
+				top.Ext.getCmp('createDate').setValue(result.createDate);
+				top.Ext.getCmp('inspectName').setValue(result.inspectName);
 				
 				if(instance.useRecord_id != null){
 					Ext.Ajax.request({
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r16559 -r16713
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 16559)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 16713)
@@ -65,6 +65,7 @@
 import com.forgon.disinfectsystem.entity.invoicemanager.LostMaterialItem;
 import com.forgon.disinfectsystem.entity.invoicemanager.TimeQuantum;
 import com.forgon.disinfectsystem.entity.packing.ReviewedBasket;
+import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoringInstance;
 import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyDisinfection;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyItem;
@@ -919,6 +920,11 @@
 				sterilizationPosition = rb.getSterilizerPosition();
 			}
 		}
+		
+		QualityMonitoringInstance qmi = null;
+		if(StringUtils.isNotBlank(tousseInstance.getBarcode())){
+			qmi = (QualityMonitoringInstance)objectDao.getByProperty(QualityMonitoringInstance.class.getSimpleName(), "barcode", tousseInstance.getBarcode());
+		}
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put("success", true);
 		map.put("tousseInstance", tousseInstance);
@@ -939,6 +945,22 @@
 			map.put("sterilizerRecordAmounts", 0);
 			map.put("sterilizationFinishConfirm", "");
 		}
+		// 定期监测、质量监测信息
+		if(qmi != null){
+			map.put("createUserName", qmi.getCreateUserName());
+			Date createDate = qmi.getCreateDate();
+			if (createDate != null) {
+				String cDate =  Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS.format(createDate);
+				map.put("createDate", cDate);
+			}else{
+				map.put("createDate", "");
+			}
+			map.put("inspectName", qmi.getFormDefinition().getFormName());
+		}else{
+			map.put("createUserName", "");
+			map.put("createDate", "");
+			map.put("inspectName", "");
+		}
 		try {
 			JSONObject jsonObject = JSONObject.fromObject(map, config);
 			StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8");