Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
===================================================================
diff -u -r14055 -r14124
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 14055)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 14124)
@@ -5,9 +5,15 @@
 	{name : 'startDate'},
 	{name : 'endDate'},
 	{name : 'washBasket'},
-	{name : 'personInCharge'}
+	{name : 'personInCharge'},
+    {name : 'washRecordID'},
+    {name : 'washDataAmount'}
 ]);
 
+function openWashDataLineChart(id){
+	openModalWindow(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId='+id, '清洗参数', '800', '600');
+}
+
 function tousseInstanceInfoShow(id,tousseName,hidden){
 	var tabsItemArr = new Array();
 		
@@ -26,7 +32,9 @@
 						    {name : 'startDate'},
 						    {name : 'endDate'},
 						    {name : 'washBasket'},
-						    {name : 'personInCharge'}
+						    {name : 'personInCharge'},
+						    {name : 'washRecordID'},
+						    {name : 'washDataAmount'}
 						]
 					})
 				}),
@@ -37,7 +45,14 @@
         		    {header : "操作员",dataIndex : 'washOperator',width : 70, menuDisabled: true},
         		    {header : "责任人",dataIndex : 'personInCharge',width : 70, menuDisabled: true},
         		    {header : "开始时间",dataIndex : 'startDate',width : 160, menuDisabled: true,renderer : myDateFormatBySecond},
-        		    {id : 'endDate',header : "结束时间",dataIndex : 'endDate',width : 160, menuDisabled: true,renderer : myDateFormatBySecond}
+        		    {id : 'endDate',header : "结束时间",dataIndex : 'endDate',width : 160, menuDisabled: true,renderer : myDateFormatBySecond},
+        		    {header : "清洗参数",dataIndex : 'washDataAmount',width : 70, menuDisabled: true,renderer : function(v,p,record){
+        		    	 if(record.data.washDataAmount > 0){
+        		    		 return "<img height = '20' src=" + WWWROOT + '/images/web/application_view_list.png'+" onclick=\"getCurrentTab().openWashDataLineChart('"+record.data.washRecordID+"') \">";
+        		    	 }else{
+        		    		 return null;
+        		    	 }  
+        	     	 }}
         		]),
 				enableHdMenu : false,
 				width : 900,
@@ -194,6 +209,14 @@
 				labelSeparator : '：',
 				labelAlign : 'right',
 				items : [{
+					xtype : 'hidden',
+					name : 'sterilizationRecordID',
+					id : 'sterilizationRecordID'
+				},{
+					xtype : 'hidden',
+					name : 'sterilizerRecordAmounts',
+					id : 'sterilizerRecordAmounts'
+				},{
 					layout : 'column',
 					autoHeight : true,
 					items : [{
@@ -279,7 +302,7 @@
 						layout : 'form',
 						columnWidth : .5,
 						cls:'edit-part2-labelwidth',
-						items : [{
+						items : [{	
 							id : 'sterilizationBasket',
 							name : 'sterilizationBasket',
 							xtype : 'textfield',
@@ -288,6 +311,26 @@
 							readOnly : true,
 							cls : 'fieldReadOnlyNoRemove'
 						}]
+					},{
+						layout : 'form',
+						columnWidth : .5,
+						cls:'edit-part2-labelwidth',
+						bodyStyle : 'padding:0px 0px 0px 50px',
+						items : [{
+							xtype : 'button',
+							text : '灭菌参数',
+							minWidth : 50,
+							readOnly : true,
+							anchor : '100%',
+							cls : 'fieldReadOnlyNoRemove',
+							handler : function() {
+								var amounts = top.Ext.getCmp('sterilizerRecordAmounts').getValue();
+								var srID = top.Ext.getCmp('sterilizationRecordID').getValue();
+								if(amounts > 0){
+									openSterilizerRecordLineChart(srID);
+								}
+							}
+						}]
 					}]
 				}],
 				buttons : [{
@@ -643,6 +686,8 @@
 					var endDate = jsonItem.endDate;
 					var washBasket = jsonItem.washBasket;
 					var personInCharge = jsonItem.personInCharge;
+					var washRecordID = jsonItem.washRecordID;
+					var washDataAmount = jsonItem.washDataAmount;
 					
 					if(disinfectIdentification != null && disinfectIdentification != ""){
 						var WashRecordData = new WashRecord({
@@ -652,7 +697,9 @@
 							startDate : startDate,
 							endDate : endDate,
 							washBasket : washBasket,
-							personInCharge : personInCharge
+							personInCharge : personInCharge,
+							washRecordID : washRecordID,
+							washDataAmount : washDataAmount
 						});
 						top.Ext.getCmp('washRecord').getStore().add(WashRecordData);
 					}
@@ -697,9 +744,10 @@
 				top.Ext.getCmp('frequency').setValue(instance.sterileFrequency);
 				top.Ext.getCmp('sterilizationUser').setValue(instance.sterilizationUser);
 				top.Ext.getCmp('sterilizationBasket').setValue(instance.sterilizationBasket);
-					
 				top.Ext.getCmp('startDate').setValue(instance.sterileStartTime);
 				top.Ext.getCmp('endDate').setValue(instance.sterileEndTime);
+				top.Ext.getCmp('sterilizationRecordID').setValue(result.sterilizationRecordID);
+				top.Ext.getCmp('sterilizerRecordAmounts').setValue(result.sterilizerRecordAmounts);
 				
 				if(instance.useRecord_id != null){
 					Ext.Ajax.request({
@@ -750,4 +798,7 @@
 		}
 	});
 	tousseInstanceWindow.show();
-}
\ No newline at end of file
+}
+function openSterilizerRecordLineChart(id){
+	openModalWindow(WWWROOT+'/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChart.jsp?sterilizationRecordId='+id, '灭菌器参数', '1050', '550');
+}
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r14055 -r14124
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 14055)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 14124)
@@ -70,6 +70,7 @@
 import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyDisinfection;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyItem;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.proxydisinfection.ProxyDisinfection;
+import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord;
 import com.forgon.disinfectsystem.entity.tousseitem.TousseItem;
 import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord;
 import com.forgon.disinfectsystem.invoicemanager.service.InvoiceManager;
@@ -804,7 +805,8 @@
 		String id = StrutsParamUtils.getPraramValue("tousseInstanceId", "");
 		TousseInstance tousseInstance = tousseInstanceManager
 				.getTousseInstanceById(id);
-
+		
+		SterilizationRecord sr = tousseInstance.getSterilizationRecord(objectDao);
 		Invoice invoice = invoiceManager.getInvoiceByTousseInstanceId(id);
 		JsonConfig config = new JsonConfig();
 		config.setExcludes(TousseInstance.filterProperties);
@@ -820,6 +822,8 @@
 					if(washRecords != null){
 						for (WashAndDisinfectRecord record : washRecords) {
 							JSONObject obj = new JSONObject();
+							obj.put("washRecordID", record.getId());
+							obj.put("washDataAmount", record.getWashDataAmount());
 							obj.put("disinfectIdentification", record.getDisinfectIdentification());
 							obj.put("disinfectProgram", record.getDisinfectProgram());
 							obj.put("washOperator", record.getOperator());
@@ -839,6 +843,13 @@
 		map.put("tousseInstance", tousseInstance);
 		map.put("invoice", invoice);
 		map.put("washClassifyBaskets", basketJsons);
+		if(sr != null){
+			map.put("sterilizationRecordID", sr.getId());
+			map.put("sterilizerRecordAmounts", sr.getSterilizerRecordAmount());
+		}else{
+			map.put("sterilizationRecordID", 0);
+			map.put("sterilizerRecordAmounts", 0);
+		}
 		try {
 			JSONObject jsonObject = JSONObject.fromObject(map, config);
 			StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8");