Merge branch 'master' of chenyj/cyj into master

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)) {

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 () {

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

@@ -22,7 +22,7 @@
          validator: null,
          baseversion_select: null,
          init: function () {
            
            var type = $.Util.getUrlQueryString('type');
            var schemeNm = $.Util.getUrlQueryString('schemeNm');
            var schemeId = Number($.Util.getUrlQueryString('schemeId').replace("scheme",""));

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

@@ -221,6 +221,7 @@
      });
    },
    config: function (code,pid,status,rowindex) {
      debugger
      standard.list.grid.select(rowindex);//选中行
      var row = standard.list.grid.getParent(standard.list.grid.getSelectedRow());
      var rootRow =  standard.list.grid.getParent(standard.list.grid.getParent(standard.list.grid.getSelectedRow()));

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/integration/dataset/updateMetadata.jsp

@@ -56,7 +56,8 @@
          <label>对应字典:</label>
        </td>
        <td class="td-left">
          <input id="sel_dict" type="hidden" class="max-length-50 validate-special-char f-pl5" style="width: 240px;" data-attr-scan="dictId" data-type="select"/>
          <select id="sel_dict" type="hidden" class="js-example-basic-multiple"  data-attr-scan="dictId">
          </select>
        </td>
      </tr>
      <tr>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/integration/dataset/updateMetadataJs.jsp

@@ -7,6 +7,9 @@
--%>
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<link href="${contextRoot}/develop/lib/select2/select2.min.css" rel="stylesheet">
<script src="${contextRoot}/develop/lib/select2/select2.js"></script>
<script >
  (function ($, win) {
        var standard = {};
@@ -26,9 +29,24 @@
            var version =  $("#std_version").val();
            var metadataId =  $("#metadata_id").val();
            $("#sel_dict").ligerComboBox({url : u._url+"/standardCenter/getDicts?stdVersion="+version ,
              cancelable:false,
             });
            $.ajax({
              url:u._url+"/standardCenter/getDicts?stdVersion="+version,
              type:"post",
              dataType: "json",
              success:function (data) {
                debugger;
                if(data.successFlg){
                  var option = "";
                  var list = data.detailModelList;
                  for(var i=0;i<list.length;i++){
                    option += '<option value="' +list[i].code+'">'+list[i].value+'</option>';
                  }
                  $("#sel_dict").html(option);
                  $("#sel_dict").select2();
                }
              }
            });
            if(type==""){//查看数据元信息
              u.$div_see_metadata_info_form.show();
@@ -44,7 +62,6 @@
                data: {datasetId: datasetId,stdVersion:version,metadataId:metadataId},
                success: function (data) {
                  if(data.successFlg){
                    debugger
                    if(type=="modify"){//修改数据元信息
                      u.$type_form.attrScan();
                      u.$type_form.Fields.fillValues({
@@ -129,6 +146,7 @@
            dataJson[0]["standardId"] = Number(standardId);
            dataJson[0]["primaryKey"] = $("#ck_primaryKey").prop("checked")==true?1:0;
            dataJson[0]["nullable"] = $("#ck_nullable").prop("checked")==true?1:0;
            debugger
            if($("#type").val()=="modify"){//修改
              _url = $("#hd_url").val() + "/standardCenter/updateMetadata";
              dataJson[0]["id"] = Number(id);

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

@@ -1,4 +1,4 @@
<%--
<%@ page import="com.yihu.ehr.system.model.SystemUser" %><%--
  Created by IntelliJ IDEA.
  User: llh
  Date: 2016/1/7
@@ -19,7 +19,6 @@
    TypeSearch: null,
    $search: $('#inp_search'),
    init: function () {
      this.top = $.Util.getTopWindowDOM();
      //CDA 列名
      this.columns = [
@@ -33,7 +32,16 @@
            return ' <div style="vertical-align:middle;margin-top: 10px;"><span>未发布  </span><img src="${contextRoot}/develop/images/button/fabuwei_icon.png"/></a></div>';
          }
        }},
        { display: '发布者', name: 'publisher',width: '20%', align: 'center', type: 'int' },
        { display: '发布者', name: 'publisher',width: '20%', align: 'center', type: 'int', render: function (rowdata, rowindex, value) {
          <%
                SystemUser user = (SystemUser) session.getAttribute("userInfo");
                String systemName = user.getUserName();
           %>
          var userName = "<%=systemName%>";
          if(rowdata.status==1 && rowdata.type=="2"){
            return userName;
          }
        } },
        { display: '发布时间', name: 'date', width: '20%' ,  align: 'center',render: function (rowdata, rowindex, value) {
            if(!Util.isStrEmpty(rowdata.date)){
              return (rowdata.date+"").substring(0,19);

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

@@ -1,4 +1,4 @@
<%--
<%@ page import="com.yihu.ehr.system.model.SystemUser" %><%--
  Created by IntelliJ IDEA.
  User: llh
  Date: 2016/1/7
@@ -72,7 +72,16 @@
                        if(type == ""){//查看标准版本信息
                            $("#lbl_version").text(u._getData.version);
                            $("#lbl_primaryVersion").text(u._getData.primaryVersion);
                            $("#lbl_publishUser").text(u._getData.publishUser);
                            <%
                             SystemUser user = (SystemUser) session.getAttribute("userInfo");
                             String systemName = user.getUserName();
                            %>
                            var userName = "<%=systemName%>";
                            if($.Util.isStrEmpty(u._getData.publishUser)) {
                                $("#lbl_publishUser").text(userName);
                            }else{
                                $("#lbl_publishUser").text(u._getData.publishUser);
                            }
                            $("#lbl_seename").text(u._getData.name);
                            if($.Util.isStrEmpty(u._getData.publishTime)){
                                $("#lbl_publishTime").text("");