Merge branch 'master' of lulihong0928/eip into master

src/main/webapp/WEB-INF/ehr/jsp/standard/adapterplan/adapterCustomizeJs.jsp

@@ -169,7 +169,7 @@
              if(data.successFlg){
                $.ligerDialog.alert(data.message, "提示", "success", function () {
                  parent.adapterplan.list.getTypeList();
                  parent.adapterplan.list.top.dialog_adapter_detail.close()
                  parent.adapterplan.list.dialog_adapter_detail.close()
                }, null);
              }else{
                $.ligerDialog.error(data.message);

src/main/webapp/WEB-INF/ehr/jsp/standard/adapterplan/adapterDetailJs.jsp

@@ -103,7 +103,7 @@
              if(data.successFlg){
                $.ligerDialog.alert(data.message, "提示", "success", function () {
                  parent.adapterplan.list.getTypeList();//刷新数据
                  parent.adapterplan.list.top.dialog_adapter_detail.close();
                  parent.adapterplan.list.dialog_adapter_detail.close();
                }, null);
              }else{
                $.ligerDialog.error(data.message);
@@ -120,7 +120,7 @@
            adapterplan.attr.save();//保存适配
          });
          $("#btn_close").click(function () {
            parent.adapterplan.list.top.dialog_adapter_detail.close();
            parent.adapterplan.list.dialog_adapter_detail.close();
          });
          //平台标准名称
//          $("#sel_stdId").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getStandards" ,

src/main/webapp/WEB-INF/ehr/jsp/standard/adapterplan/indexJs.jsp

@@ -21,7 +21,7 @@
    TypeSearch: null,
    adapterCustomize:null,
    init: function () {
      this.top = $.Util.getTopWindowDOM();
//      this.top = $.Util.getTopWindowDOM();
      //CDA 列名
      this.columns = [
        { display: 'stdVersion', name: 'stdVersion', hide:true},
@@ -127,7 +127,7 @@
    },
    showDialog: function (_tital, _url, _height, _width, callback) {
      adapterplan.list.top.dialog_adapter_detail = $.ligerDialog.open({
      adapterplan.list.dialog_adapter_detail = $.ligerDialog.open({
        title: _tital,
        url: _url,
        height: _height,

src/main/webapp/WEB-INF/ehr/jsp/standard/adapterplan/versionDetailJs.jsp

@@ -128,7 +128,7 @@
            if(data.successFlg){
              $.ligerDialog.alert(data.message, "提示", "success", function () {
                parent.adapterplan.list.getTypeList();//刷新数据
                parent.adapterplan.list.top.dialog_adapter_detail.close();
                parent.adapterplan.list.dialog_adapter_detail.close();
              }, null);
            }else{
              $.ligerDialog.error(data.message);
@@ -146,10 +146,10 @@
          adapterplan.version.save();//保存
        });
        $("#btn_close").click(function () {
          parent.adapterplan.list.top.dialog_adapter_detail.close();
          parent.adapterplan.list.dialog_adapter_detail.close();
        });
        $("#btn_confirm").click(function () {
          parent.adapterplan.list.top.dialog_adapter_detail.close();
          parent.adapterplan.list.dialog_adapter_detail.close();
        });
      }
    };

src/main/webapp/WEB-INF/ehr/jsp/standard/integration/appIndexJs.jsp

@@ -19,7 +19,7 @@
    TypeSearch: null,
    $search: $('#inp_search'),
    init: function () {
      this.top = $.Util.getTopWindowDOM();
//      this.top = $.Util.getTopWindowDOM();
      <%
                SystemUser user = (SystemUser) session.getAttribute("userInfo");
                String systemName = user.getUserName();
@@ -163,7 +163,7 @@
      window.grid = u.grid;
    },
    showDialog: function (_tital, _url, _height, _width, callback) {
      standard.list.top.dialog_standard_detail = $.ligerDialog.open({
      standard.list.dialog_standard_detail = $.ligerDialog.open({
        title: _tital,
        url: _url,
        height: _height,

src/main/webapp/WEB-INF/ehr/jsp/standard/integration/indexJs.jsp

@@ -19,7 +19,7 @@
    TypeSearch: null,
    $search: $('#inp_search'),
    init: function () {
      this.top = $.Util.getTopWindowDOM();
//      this.top = $.Util.getTopWindowDOM();
      <%
                SystemUser user = (SystemUser) session.getAttribute("userInfo");
                String systemName = user.getUserName();
@@ -158,7 +158,7 @@
      window.grid = u.grid;
    },
    showDialog: function (_tital, _url, _height, _width, callback) {
      standard.list.top.dialog_standard_detail = $.ligerDialog.open({
      standard.list.dialog_standard_detail = $.ligerDialog.open({
        title: _tital,
        url: _url,
        height: _height,

src/main/webapp/WEB-INF/ehr/jsp/standard/integration/publisherJs.jsp

@@ -47,7 +47,7 @@
        },
        event: function () {
          $("#btn_confirm").click(function () {
            parent.standard.list.top.dialog_standard_detail.close();
            parent.standard.list.dialog_standard_detail.close();
          });
        }
      };

src/main/webapp/WEB-INF/ehr/jsp/standard/integration/standardDetailJs.jsp

@@ -129,7 +129,7 @@
                  if(data.successFlg){
                      $.ligerDialog.alert(data.message, "提示", "success", function () {
                          parent.standard.list.getTypeList();//刷新数据
                          parent.standard.list.top.dialog_standard_detail.close();
                          parent.standard.list.dialog_standard_detail.close();
                      }, null);
                  }else{
                      $.ligerDialog.error(data.message);
@@ -145,7 +145,7 @@
            standard.attr.save();//保存标准
          });
          $("#btn_close").click(function () {
            parent.standard.list.top.dialog_standard_detail.close();
            parent.standard.list.dialog_standard_detail.close();
          });
        }
      };

src/main/webapp/WEB-INF/ehr/jsp/standard/integration/versionDetailJs.jsp

@@ -157,7 +157,7 @@
                    if(data.successFlg){
                        $.ligerDialog.alert(data.message, "提示", "success", function () {
                            parent.standard.list.getTypeList();//刷新数据
                            parent.standard.list.top.dialog_standard_detail.close();
                            parent.standard.list.dialog_standard_detail.close();
                        }, null);
                    }else{
                        $.ligerDialog.error(data.message);
@@ -212,10 +212,10 @@
            standard.version.save();//保存
          });
          $("#btn_close").click(function () {
            parent.standard.list.top.dialog_standard_detail.close();
            parent.standard.list.dialog_standard_detail.close();
          });
            $("#btn_confirm").click(function () {
                parent.standard.list.top.dialog_standard_detail.close();
                parent.standard.list.dialog_standard_detail.close();
            });
        }
      };