Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceView.jsp
===================================================================
diff -u -r41151 -r41647
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceView.jsp	(.../deviceInterfaceView.jsp)	(revision 41151)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceView.jsp	(.../deviceInterfaceView.jsp)	(revision 41647)
@@ -148,6 +148,10 @@
 var PARAMATCHINGMETHOD_CYCLECOUNTER = '<%=DeviceInterface.PARAMATCHINGMETHOD_CYCLECOUNTER%>';
 //按结束时间
 var PARAMATCHINGMETHOD_ENDDATE = '<%=DeviceInterface.PARAMATCHINGMETHOD_ENDDATE%>';
+//ZJJSRM-78:单仓
+var BELIMED_MODEL_SINGLE_WAREHOUSE = '<%=DeviceInterface.BELIMED_MODEL_SINGLE_WAREHOUSE%>';
+//ZJJSRM-78:长龙
+var BELIMED_MODEL_LONG_DRAGON = '<%=DeviceInterface.BELIMED_MODEL_LONG_DRAGON%>';
 
 /**
  * 《供应商包添加》权限
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js
===================================================================
diff -u -r41151 -r41647
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js	(.../deviceInterfaceForm.js)	(revision 41151)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js	(.../deviceInterfaceForm.js)	(revision 41647)
@@ -196,7 +196,11 @@
 							if (combo.value == 'V1.0') {
 								showCmt('paraMatchingMethodWrap', 'paraMatchingMethod', false, paraMatchingMethodStore);
 								top.Ext.getCmp("paraMatchingMethod").setValue(PARAMATCHINGMETHOD_STARTDATE);
-								hideCmt('deviceModelWrap', 'deviceModel', true);
+								var versionComboStore = new Ext.data.SimpleStore({
+									fields: ['value'],
+									data: [['&nbsp;'], [BELIMED_MODEL_SINGLE_WAREHOUSE], [BELIMED_MODEL_LONG_DRAGON]]
+								})
+								showCmt('deviceModelWrap', 'deviceModel', false, versionComboStore);
 							} else {
 								hideCmt('paraMatchingMethodWrap', 'paraMatchingMethod', true);
 								var versionComboStore = new Ext.data.SimpleStore({
@@ -580,10 +584,14 @@
 			var version = top.Ext.getCmp("version").getValue();
 			if (version == VERSION_1_0) {
 				showCmt('paraMatchingMethodWrap', 'paraMatchingMethod', false, paraMatchingMethodStore);
-				hideCmt('deviceModelWrap', 'deviceModel', true);
 				if (clearValue) {
 					top.Ext.getCmp("paraMatchingMethod").setValue(PARAMATCHINGMETHOD_STARTDATE);
 				}
+				var versionComboStore = new Ext.data.SimpleStore({
+					fields: ['value'],
+					data: [['&nbsp;'], [BELIMED_MODEL_SINGLE_WAREHOUSE], [BELIMED_MODEL_LONG_DRAGON]]
+				})
+				showCmt('deviceModelWrap', 'deviceModel', false, versionComboStore);
 			} else {
 				hideCmt('paraMatchingMethodWrap', 'paraMatchingMethod', true);
 				var versionComboStore = new Ext.data.SimpleStore({
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp
===================================================================
diff -u -r41151 -r41647
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp	(.../washAndDisinfectView.jsp)	(revision 41151)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp	(.../washAndDisinfectView.jsp)	(revision 41647)
@@ -130,6 +130,10 @@
 var XINHUA_PDF_SUPER6000 = '<%=DeviceInterface.XINHUA_PDF_SUPER6000%>';
 //BJDXZLYY-66：新增型号：MAG-GSZK260（CSV格式）
 var MARGE_MODEL_MAG_GSZK260_CSV = '<%=DeviceInterface.MARGE_MODEL_MAG_GSZK260_CSV%>';
+//ZJJSRM-78:单仓
+var BELIMED_MODEL_SINGLE_WAREHOUSE = '<%=DeviceInterface.BELIMED_MODEL_SINGLE_WAREHOUSE%>';
+//ZJJSRM-78:长龙
+var BELIMED_MODEL_LONG_DRAGON = '<%=DeviceInterface.BELIMED_MODEL_LONG_DRAGON%>';
 </script>
 
 <!-- 日期控件引入 -->
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp
===================================================================
diff -u -r41151 -r41647
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp	(.../interfereWashAndDisinfectRecordView.jsp)	(revision 41151)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp	(.../interfereWashAndDisinfectRecordView.jsp)	(revision 41647)
@@ -52,6 +52,10 @@
 	var XINHUA_PDF_SUPER6000 = '<%=DeviceInterface.XINHUA_PDF_SUPER6000%>';
 	//BJDXZLYY-66：新增型号：MAG-GSZK260（CSV格式）
 	var MARGE_MODEL_MAG_GSZK260_CSV = '<%=DeviceInterface.MARGE_MODEL_MAG_GSZK260_CSV%>';
+	//ZJJSRM-78:单仓
+	var BELIMED_MODEL_SINGLE_WAREHOUSE = '<%=DeviceInterface.BELIMED_MODEL_SINGLE_WAREHOUSE%>';
+	//ZJJSRM-78:长龙
+	var BELIMED_MODEL_LONG_DRAGON = '<%=DeviceInterface.BELIMED_MODEL_LONG_DRAGON%>';
 </script>
 
 <script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
===================================================================
diff -u -r41618 -r41647
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js	(.../washAndDisinfectView.js)	(revision 41618)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js	(.../washAndDisinfectView.js)	(revision 41647)
@@ -192,20 +192,22 @@
 					} else {
 						openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/showFileForPDF.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '1050', '700');
 					}
-				} else {
-					openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id + '&deviceBrand=Belimed', '', '清洗参数', '800', '600');
+				} else if (data.deviceModel == BELIMED_MODEL_LONG_DRAGON){
+					if (sstsConfig.belimedLineChartType == 1) {
+						// ZJJSRM-15倍力曼清洗机接口
+						openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfBelimed.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
+					} else {
+						openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
+					}
+				}else if(data.deviceModel == BELIMED_MODEL_SINGLE_WAREHOUSE){
+					openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
+				}else {
+					openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
 				}
 			} else if (data.deviceBrand == JNK) {
 				if (data.deviceModel == DEVICETYPE_JK_NQX1500) {
 					winByDeviceModel(id, data.deviceModel);
 				}
-			} else {
-				if (sstsConfig.belimedLineChartType == 1) {
-					// ZJJSRM-15倍力曼清洗机接口
-					openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfBelimed.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
-				} else {
-					openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
-				}
 			}
 		}
 	});
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js
===================================================================
diff -u -r41151 -r41647
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js	(.../interfereWashAndDisinfectRecordView.js)	(revision 41151)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js	(.../interfereWashAndDisinfectRecordView.js)	(revision 41647)
@@ -555,24 +555,30 @@
 							openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/showFileForPDF.jsp?washAndDisinfectRecordId=' + id,'', '清洗参数', '1050', '700');
 						}
 					}
+				} else if (data.deviceModel == BELIMED_MODEL_LONG_DRAGON){
+					if (sstsConfig.belimedLineChartType == 1) {
+						// ZJJSRM-15倍力曼清洗机接口
+						openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfBelimed.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
+					} else {
+						if(isFrame){
+							top.document.getElementById('thisIframe').src = WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id + '&washDataRecordId=' + washDataRecordId;
+						}else {
+							openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
+						}
+					}
+				}else if(data.deviceModel == BELIMED_MODEL_SINGLE_WAREHOUSE){
+					if(isFrame){
+						top.document.getElementById('thisIframe').src = WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id + '&washDataRecordId=' + washDataRecordId;
+					}else {
+						openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
+					}
 				}else {
 					if(isFrame){
 						top.document.getElementById('thisIframe').src = WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id + '&washDataRecordId=' + washDataRecordId + '&deviceBrand=Belimed';
 					}else {
 						openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id + '&deviceBrand=Belimed', '', '清洗参数', '800', '600');
 					}
 				}
-			} else {
-				if (sstsConfig.belimedLineChartType == 1) {
-					// ZJJSRM-15倍力曼清洗机接口
-					openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfBelimed.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
-				} else {
-					if(isFrame){
-						top.document.getElementById('thisIframe').src = WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id + '&washDataRecordId=' + washDataRecordId;
-					}else {
-						openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
-					}
-				}
 			}
 		}
 	});