Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
===================================================================
diff -u -r40401 -r40581
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js	(.../washAndDisinfectView.js)	(revision 40401)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js	(.../washAndDisinfectView.js)	(revision 40581)
@@ -130,9 +130,7 @@
 				return;
 			}
 			var data = resultStr.data;
-			if (data.deviceBrand == changLong) {
-				openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataGridChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
-			} else if (data.deviceBrand == marge) {
+			if (data.deviceBrand == marge) {
 				if (data.deviceModel == MARGE_MODEL_MAG_CL4) {
 					winByDeviceModel(id, data.deviceModel);
 				}else {
@@ -172,6 +170,8 @@
 				// DGSFYBJY-54 史帝瑞清洗机(型号：AMSCO 3052)
 				if (data.deviceModel == STERIS_AMSCO_3052) {
 					openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfSterisMSCO3052.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
+				}else if(data.deviceModel == STERIS_CHANGLONG){
+					openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataGridChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
 				} else {
 					openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
 				}
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp
===================================================================
diff -u -r40380 -r40581
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp	(.../washAndDisinfectView.jsp)	(revision 40380)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp	(.../washAndDisinfectView.jsp)	(revision 40581)
@@ -118,7 +118,6 @@
 var basketAllowProcedure = '<%=Container.CONTAINER_STATUS_FREE%>;<%=Container.CONTAINER_STATUS_WASHLOADING%>;<%=Container.CONTAINER_STATUS_WASHED%>;<%=Container.CONTAINER_STATUS_PACKED%>';
 var qmFormType = '<%=FormDefinition.FOMRTYPE_QUALITYMONITORING%>';
 //设备品牌,型号
-var changLong = '<%= DeviceInterface.CHANGLONG %>';
 var changlong_DC_4 = '<%= DeviceInterface.XINHUA_CHANGLONG_DC_4 %>';
 var changlong_DC_5 = '<%= DeviceInterface.XINHUA_CHANGLONG_DC_5 %>';
 var marge = '<%= DeviceInterface.MARGE %>';
@@ -137,6 +136,8 @@
 var DEVICETYPE_JK_NQX1500 = '<%=DeviceInterface.DEVICETYPE_JK_NQX1500%>';
 //NYSY-75：新增型号：美雅洁 MAG-CL4
 var MARGE_MODEL_MAG_CL4 = '<%=DeviceInterface.MARGE_MODEL_MAG_CL4%>';
+//JMSZXYY-112：新增型号：史帝瑞长龙 changlong
+var STERIS_CHANGLONG = '<%=DeviceInterface.STERIS_CHANGLONG%>';
 </script>
 
 <!-- 日期控件引入 -->
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp
===================================================================
diff -u -r40401 -r40581
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp	(.../interfereWashAndDisinfectRecordView.jsp)	(revision 40401)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp	(.../interfereWashAndDisinfectRecordView.jsp)	(revision 40581)
@@ -27,7 +27,6 @@
 	var washfaild = '<%=WashAndDisinfectRecord.STATUS_WASHFAILD%>';
 	var interrupt = '<%=WashAndDisinfectRecord.STATUS_INTERRUPT%>';
 	//设备品牌,型号
-	var changLong = '<%= DeviceInterface.CHANGLONG %>';
 	var changlong_DC_4 = '<%= DeviceInterface.XINHUA_CHANGLONG_DC_4 %>';
 	var changlong_DC_5 = '<%= DeviceInterface.XINHUA_CHANGLONG_DC_5 %>';
 	var marge = '<%= DeviceInterface.MARGE %>';
@@ -46,6 +45,9 @@
 	var MARGE_MODEL_MAG_CL4 = '<%=DeviceInterface.MARGE_MODEL_MAG_CL4%>';
 	//XJJQZYY-133：新增设备型号金尼克JK-NQX1500
 	var DEVICETYPE_JK_NQX1500 = '<%=DeviceInterface.DEVICETYPE_JK_NQX1500%>';
+	//JMSZXYY-112：新增型号：史帝瑞长龙 changlong
+	var STERIS_CHANGLONG = '<%=DeviceInterface.STERIS_CHANGLONG%>';
+	var WASHDATATYPE_STERIS_CHANGLONG = '<%=WashAndDisinfectRecord.WASHDATATYPE_STERIS_CHANGLONG%>';
 </script>
 
 <script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js
===================================================================
diff -u -r40579 -r40581
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js	(.../deviceInterfaceForm.js)	(revision 40579)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js	(.../deviceInterfaceForm.js)	(revision 40581)
@@ -374,6 +374,13 @@
 			top.Ext.getCmp("userName").setValue(dencryptText(action.result.data.userName,DEVICEINTERFACE_ENCRPT_DEPTH));
 			top.Ext.getCmp("password").setValue(dencryptText(action.result.data.password,DEVICEINTERFACE_ENCRPT_DEPTH));
 			onDeviceBrandChange();
+			if(action.result.data.deviceModel == STERIS_CHANGLONG){
+				showCmt('paraMatchingMethodWrap','paraMatchingMethod',true);
+				showCmt('deviceTypeWrap','deviceType',true);
+				top.Ext.getCmp("deviceModel").setValue(STERIS_CHANGLONG);
+				top.Ext.getCmp("paraMatchingMethod").setValue(action.result.data.paraMatchingMethod);
+				top.Ext.getCmp("deviceType").setValue(action.result.data.deviceType);
+			}
 		},
 		failure : function(form, action) {
 		},
@@ -448,7 +455,7 @@
 			hideCmt('paraMatchingMethodWrap','paraMatchingMethod',true);
 		}
 	}else if(deviceBrand == STERIS){
-		if(deviceModel == CHANGLONG){
+		if(deviceModel == STERIS_CHANGLONG){
 			var paraMatchingMethodComboStore = new Ext.data.SimpleStore({
 				fields : [ 'value' ],
 				data : [['清洗结束时间'],['循环次数']]
@@ -545,7 +552,7 @@
 		}else if(deviceBrand == STERIS){
 			sterisModelComboStore = new Ext.data.SimpleStore({
 				fields : [ 'value' ],
-				data : [['&nbsp;'],[STERIS_AMSCO_3052],[STERIS_AMSCO_V_PRO_MAX],[CHANGLONG]]
+				data : [['&nbsp;'],[STERIS_AMSCO_3052],[STERIS_AMSCO_V_PRO_MAX],[STERIS_CHANGLONG]]
 			})
 			showCmt('deviceModelWrap','deviceModel',true,sterisModelComboStore);
 		}else if(deviceBrand == BELIMED ){
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataGridChart.jsp
===================================================================
diff -u -r29513 -r40581
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataGridChart.jsp	(.../washDataGridChart.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataGridChart.jsp	(.../washDataGridChart.jsp)	(revision 40581)
@@ -49,12 +49,11 @@
 		}
 	.myWrap {
 		float : left;
-		margin-left : 20px;
+		margin-left : 1%;
 		margin-bottom : 50px;
-		width : 350px;
-		height : 290px;/* 
-		background-color : #444;  */
-		}
+		width : 48%;
+		height : 290px;
+	}
 	</style>
 	
 	<script type="text/javascript">
@@ -64,7 +63,7 @@
 	var dryingStatus = '<%=WashDataItemOfChangLong.WASH_STATUS_DRYING%>';
 	$(document).ready(function () {
 		$.ajax({
-			url 	: '${pageContext.request.contextPath}/disinfectSystem/washData/washDataLineChartAction!createGridChart.do?washAndDisinfectRecordId=${param.washAndDisinfectRecordId}'+'&time='+new Date().getTime(),
+			url 	: '${pageContext.request.contextPath}/disinfectSystem/washData/washDataLineChartAction!createGridChart.do?washAndDisinfectRecordId=${param.washAndDisinfectRecordId}&washDataRecordId=${param.washDataRecordId}'+'&time='+new Date().getTime(),
 			dataType: 'json',
 			success	: function(result){
 				if(isUndefinedOrNullOrEmpty(result)){
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js
===================================================================
diff -u -r40403 -r40581
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js	(.../interfereWashAndDisinfectRecordView.js)	(revision 40403)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js	(.../interfereWashAndDisinfectRecordView.js)	(revision 40581)
@@ -134,9 +134,9 @@
 	var disinfectIdentification = records[0].data.disinfectIdentification;
 	var operator = records[0].data.operator;
 	var disinfectProgram = records[0].data.disinfectProgram;
+	var washDataType = records[0].data.washDataType;
 	var defaultOperationStart = getDefaultDate(startDate,7);
 	var defaultOperationEnd = getDefaultDate(startDate);
-
 	var washDataStore = new top.Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
 			url:WWWROOT + '/disinfectSystem/washData/washDataLineChartAction!findWashDataList.do',
@@ -148,6 +148,7 @@
 		}, [
 			{name : 'washDataRecordId',mapping : 'washDataRecordId'}, 
 			{name : 'startDate',mapping : 'startDate'},
+			{name : 'endDate',mapping : 'endDate'},
 			{name : 'fileName',mapping : 'fileName'}
 		]),
 		listeners:{
@@ -162,6 +163,19 @@
 		}
 	});
 
+	var cm = new top.Ext.grid.ColumnModel([
+		{header : "id",dataIndex : 'id',hidden : true},
+		{header : "清洗开始时间",width : 80,dataIndex : 'startDate',menuDisabled:true},
+		{header : "文件名",width : 80,dataIndex : 'fileName',menuDisabled:true}
+	])
+
+	if(washDataType == WASHDATATYPE_STERIS_CHANGLONG){
+		cm = new top.Ext.grid.ColumnModel([
+			{header : "id",dataIndex : 'id',hidden : true},
+			{header : "清洗结束时间",width : 80,dataIndex : 'endDate',menuDisabled:true},
+			{header : "文件名",width : 80,dataIndex : 'fileName',menuDisabled:true}
+		])
+	}
 	var form = new top.Ext.FormPanel({
 		id : 'associatedWashForm',
 		frame : true,
@@ -305,11 +319,7 @@
 							store : washDataStore ,
 							height:400,
 							bodyStyle : 'border:1px solid #afd7af',
-							cm : new top.Ext.grid.ColumnModel([
-								{header : "id",dataIndex : 'id',hidden : true},
-								{header : "清洗开始时间",width : 80,dataIndex : 'startDate',menuDisabled:true},
-								{header : "文件名",width : 80,dataIndex : 'fileName',menuDisabled:true}
-							]),
+							cm : cm,
 							autoExpandColumn : 'fileName',
 							frame : false,
 							viewConfig: {forceFit:true},
@@ -450,9 +460,7 @@
 				return;
 			}
 			var data = resultStr.data;
-			if (data.deviceBrand == changLong) {
-				openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataGridChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
-			} else if (data.deviceBrand == marge) {
+			if (data.deviceBrand == marge) {
 				if (data.deviceModel == MARGE_MODEL_MAG_CL4) {
 					if(isFrame){
 						var url = WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfExt.jsp?washAndDisinfectRecordId=' + id + '&deviceModel='+data.deviceModel + '&washDataRecordId=' + washDataRecordId;
@@ -512,6 +520,12 @@
 					}else {
 						openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfSterisMSCO3052.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
 					}
+				}else if(data.deviceModel == STERIS_CHANGLONG){
+					if(isFrame){
+						top.document.getElementById('thisIframe').src = WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataGridChart.jsp?washAndDisinfectRecordId=' + id + '&washDataRecordId=' + washDataRecordId;
+					}else {
+						openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataGridChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
+					}
 				} else {
 					if(isFrame){
 						top.document.getElementById('thisIframe').src = WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id + '&washDataRecordId=' + washDataRecordId;