Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp
===================================================================
diff -u -r40302 -r40399
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp	(.../interfereWashAndDisinfectRecordView.jsp)	(revision 40302)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp	(.../interfereWashAndDisinfectRecordView.jsp)	(revision 40399)
@@ -42,6 +42,8 @@
 	//SZSZLYY-66：新增型号：WD500
 	var GETING_WD500 = '<%=DeviceInterface.GETING_WD500%>';
 	var fontSize = '{fontSize}';
+	//NYSY-75：新增型号：美雅洁 MAG-CL4
+	var MARGE_MODEL_MAG_CL4 = '<%=DeviceInterface.MARGE_MODEL_MAG_CL4%>';
 </script>
 
 <script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js
===================================================================
diff -u -r40302 -r40399
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js	(.../interfereWashAndDisinfectRecordView.js)	(revision 40302)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js	(.../interfereWashAndDisinfectRecordView.js)	(revision 40399)
@@ -401,6 +401,45 @@
 	loadFormData(grid);
 }
 
+//NYSY-75：美雅洁 MAG-CL4
+function winByDeviceModel(id, deviceModel){
+	var url = WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfExt.jsp?washAndDisinfectRecordId=' + id + '&deviceModel='+deviceModel;
+	var win = new top.Ext.Window({
+		title: '清洗参数',
+		id: 'extWindow' + id,
+		width: 850,
+		height: 640,
+		autoScroll: false,
+		isTopContainer: true,
+		modal: true,
+		resizable: false,
+		buttonAlign: 'center',
+		items: [{
+			xtype: "panel",
+			id: "index",
+			html: "<iframe id='thisIframe' src='" + url + "' scrolling='yes' frameborder=0 width=835 height=610></iframe>"
+		}],
+		buttons: [{
+			text: '打印',
+			id: 'print',
+			hidden: true,
+			handler: function () {
+				top.document.getElementById('thisIframe').contentWindow.document.getElementById('print').click();
+			}
+		}, {
+			text: '关闭',
+			id: 'close',
+			handler: function () {
+				win.close();
+			}
+		}]
+	})
+	win.show()
+	if(deviceModel == DEVICETYPE_JK_NQX1500){
+		top.Ext.getCmp('print').show();
+	}
+}
+
 function openWashDataLineChart(id,washDataRecordId,isFrame) {
 	Ext.Ajax.request({
 		url: WWWROOT + '/disinfectSystem/washData/washDataLineChartAction!getRinserTypeInfo.do?washAndDisinfectRecordId=' + id + '&time=' + new Date().getTime(),
@@ -414,7 +453,11 @@
 			if (data.deviceBrand == changLong) {
 				openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataGridChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
 			} else if (data.deviceBrand == marge) {
-				openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.jsp?washAndDisinfectRecordId=' + id + '&deviceModel=' + data.deviceModel, '', '清洗参数', '800', '600');
+				if (data.deviceModel == MARGE_MODEL_MAG_CL4) {
+					winByDeviceModel(id, data.deviceModel);
+				}else {
+					openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.jsp?washAndDisinfectRecordId=' + id + '&deviceModel=' + data.deviceModel, '', '清洗参数', '800', '600');
+				}
 			} else if (data.deviceBrand == xinHua) {
 				if (sstsConfig.washDataLineChartType == 1) {
 					if (data.deviceModel == changlong_DC_4) {