Merge branch 'referMaster' into his/zjhospital

# Conflicts:
#	src/js/promise.js

src/js/promise.js

@@ -37,6 +37,7 @@ const config = {
   information: '/api/data/conceptDetail/getConceptDetail',
   informationMore: '/api/data/conceptDetail/getConceptDetails',
   pushScale: '/api/data/push/pushScale',
+  pushTreatment: '/api/data/push/pushTreatment',
   getSysSetInfoDatas: '/api/data/sysSet/getSysSetInfoDatas',
   getMr: '/api/data/mr/getMr',
   getVersion: '/api/data/versionInfo/getVersionInfoAlls',
@@ -49,12 +50,12 @@ const config = {
     '8':'4,5'
   }
 }
-const imageUrlPrefix = 'http://192.18.101.207:82';
-// const getUrlArgObject = function(parm) {
+const imageUrlPrefix = 'http://192.168.2.122:82';
+// const getUrlArgObject = function(parm) {  
 //   var query = decodeURI(window.location.search);
 //   var args = qs.parse(qs.parse(query.substr(1)));
-//   return args[parm];//返回对象
-// }
+//   return args[parm];//返回对象  
+// } 
 
 const getUrlArgObject = function getQueryString(name) {
   var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");