Browse Source

对方案进行标准定制 定制完成后的配置内 应该只有被定制的标准

yingjie 9 years ago
parent
commit
0a8be4baa7

+ 7 - 0
Hos-resource/src/main/java/com/yihu/ehr/standard/service/standard/StdDatasetService.java

@ -266,6 +266,13 @@ public class StdDatasetService extends SQLGeneralDAO {
            }else if(jsonNode.get("name")!=null && !jsonNode.get("name").asText().isEmpty()){
                String name = jsonNode.get("name").asText();
                sqlCreator.likeOrCondition("code", "name", name);
            } else if (jsonNode.get("stdId") != null && !jsonNode.get("stdId").asText().isEmpty()) {
                String[] stdLs = jsonNode.get("stdId").asText().split(",");
                List<Integer> stdIdLs = new ArrayList<>();
                for (String s : stdLs) {
                    stdIdLs.add(Integer.valueOf(s));
                }
                sqlCreator.inCondition("id", stdIdLs);
            }
        }
        if (!StringUtil.isEmpty(order)) {

+ 36 - 12
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/adapterplan/configurationJs.jsp

@ -39,7 +39,7 @@
        conditionArea.init();
        entryRetrieve.init();
        master.init();
        master.reloadGrid();
        //master.reloadGrid();
        entryMaster.init();
        
      }
@ -135,11 +135,12 @@
      master = {
        infoDialog: null,
        grid: null,
        stdIdStrLs:"",
        init: function () {
          
          var me = this;
          var stdVersion = $("#std_version").val();;
          var adapterStdVersion = $("#adapter_std_version").val();;
          var version = $("#version").val();;
          var version = $("#version").val();
          var schemeId = $("#scheme_id").val();
          schemeId = schemeId.replace("scheme","");
          $("#version").val(version);
@ -148,15 +149,40 @@
          $("#scheme_id").val(schemeId);
          if(this.grid)
            return;
          var version = $("#version").val();
          var url = '${contextRoot}'+'/adapterCenter/searchDatasetList?adapterVersion=' + version;
          $.ajax({
            url: url,
            type:"post",
            dataType:"json",
            success:function (data) {
              if(data.successFlg) {
                for (var i=0; i<data.detailModelList.length;i++){
                  var stdDatasetId = data.detailModelList[i].stdDatasetId;
                  me.stdIdStrLs += stdDatasetId + ",";
                }
                debugger
                me.initGrid(me.stdIdStrLs);
              }
            }
          });
          this.bindEvents();
        },
        initGrid: function (stdIdStrLs) {
          debugger
          var me = this;
          this.grid = $("#div_left_grid").ligerGrid({
            url: '${contextRoot}'+cfg[cfgModel].left.search,
            columns: this.getColumn(),
            delayLoad:true,
            parms:{stdVersion: $("#std_version").val(),condition: JSON.stringify({"name":"","stdId": stdIdStrLs})},
            columns: me.getColumn(),
            selectRowButtonOnly: true,
            allowHideColumn:false,
            validate : true,
            unSetValidateAttr:false,
            onBeforeShowData: function (data) {
              debugger
              if(data.detailModelList.length==0){
                entryMaster.reloadGrid('');
              }
@ -171,10 +197,6 @@
              entryMaster.reloadGrid(row.id);
            }
          });
          this.bindEvents();
        },
        bindEvents: function () {
          $("#searchNm").keyup(function (e) {
@ -185,18 +207,20 @@
        },
        reloadGrid: function () {
          debugger
          var me = this;
          var searchNm = $("#searchNm").val();
          var values = {
            stdVersion: $("#std_version").val(),
            condition: JSON.stringify({"name":searchNm})
            condition: JSON.stringify({"name":searchNm,"stdId":me.stdIdStrLs})
          };
          if (changeFlag){
            var url = '${contextRoot}' + cfg[cfgModel].left.search;
            reloadGrid.call(this, url, values, this.getColumn());
          }else{
            this.grid.setOptions({parms: $.extend({},values),newPage: 1});
            me.grid.setOptions({parms: $.extend({},values),newPage: 1});
            //重新查询
            this.grid.loadData(true);
            me.grid.loadData(true);
          }
        },
        getColumn: function () {