Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceView.jsp
===================================================================
diff -u -r40392 -r40584
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceView.jsp	(.../deviceInterfaceView.jsp)	(revision 40392)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceView.jsp	(.../deviceInterfaceView.jsp)	(revision 40584)
@@ -15,8 +15,6 @@
 <script type="text/javascript" src="${ctx }/dwr/interface/DeviceInterfaceTableManager.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx }/dwr/engine.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx }/dwr/util.js?version=${svnRevision}"></script>
-<script type="text/javascript" src="deviceInterfaceForm.js?version=${svnRevision}"></script>
-<script type="text/javascript" src="deviceInterfaceView.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/base64/base64Encrypt.js"></script>
 <script type="text/javascript">
 //设备型号
@@ -32,7 +30,6 @@
 //设备品牌
 var SENOH = '<%=DeviceInterface.SENOH%>';
 var KPS_CASP = '<%=DeviceInterface.KPS_CASP%>';
-var CHANGLONG = '<%=DeviceInterface.CHANGLONG%>';
 var XINHUATYPE_S7_300 = '<%=DeviceInterface.XINHUATYPE_S7_300%>';
 var MARGE = '<%=DeviceInterface.MARGE%>';
 var XINHUA = '<%=DeviceInterface.XINHUA%>';
@@ -89,6 +86,8 @@
 var XINHUA_WAICHE = '<%=DeviceInterface.XINHUA_WAICHE%>';
 //NYSY-75：新增型号：美雅洁 MAG-CL4
 var MARGE_MODEL_MAG_CL4 = '<%=DeviceInterface.MARGE_MODEL_MAG_CL4%>';
+//JMSZXYY-112：新增型号：史帝瑞长龙 changlong
+var STERIS_CHANGLONG = '<%=DeviceInterface.STERIS_CHANGLONG%>';
 /**
  * 负压清洗机（PC-L）(张家界市人民医院ZJJSRM-6)
  */
@@ -174,6 +173,8 @@
 
 
 </script>
+<script type="text/javascript" src="deviceInterfaceForm.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="deviceInterfaceView.js?version=${svnRevision}"></script>
 
 <table height="100%;" width="100%" border="0" align="center"
 	cellpadding="0" cellspacing="0">
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js
===================================================================
diff -u -r40582 -r40584
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js	(.../deviceInterfaceForm.js)	(revision 40582)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js	(.../deviceInterfaceForm.js)	(revision 40584)
@@ -374,13 +374,6 @@
 			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) {
 		},
@@ -553,6 +546,10 @@
 				data : [['&nbsp;'],[STERIS_AMSCO_3052],[STERIS_AMSCO_V_PRO_MAX],[STERIS_CHANGLONG]]
 			})
 			showCmt('deviceModelWrap','deviceModel',true,sterisModelComboStore);
+			if(deviceModel == STERIS_CHANGLONG){
+				showCmt('paraMatchingMethodWrap','paraMatchingMethod',true);
+				showCmt('deviceTypeWrap','deviceType',true);
+			}
 		}else if(deviceBrand == BELIMED ){
 			showCmt('paraMatchingMethodWrap','paraMatchingMethod',false);
 			var paraMatchingMethodValue = top.Ext.getCmp("paraMatchingMethod").getValue();