Merge branch 'master' of shine/esb into master

Hos-resource/src/main/java/com/yihu/ehr/datacollect/dao/DatacollectDao.java

@@ -75,8 +75,8 @@ public class DatacollectDao extends SQLGeneralDAO implements IDatacollectDao {
    @Override
    public String getSchemeAndVersion(String schemeVersionId) throws Exception
    {
        String sql = "select  CONCAT_WS(' -- ',s.name,v.name)  from adapter_scheme_version v\n" +
                "left join adapter_scheme s on s.id = v.scheme_id \n" +
        String sql = "select  CONCAT_WS(' -- ',s.name,v.name)  from adapter_scheme_version v " +
                "left join adapter_scheme s on s.id = v.scheme_id " +
                "where v.version='"+schemeVersionId+"'";
        return super.scalarBySql(sql, String.class);
    }

Hos-resource/src/main/java/com/yihu/ehr/resource/controller/RsCategoryController.java

@@ -47,7 +47,18 @@ public class RsCategoryController extends BaseController {
            }
            model.addAttribute("resourceId", id);
            model.addAttribute("mode", mode);
            String s=rrrd.getRemark();
            StringBuilder s1=new StringBuilder();
            for(int i=0;i<s.length();i++) {
                if (s.charAt(i) == '\'' || s.charAt(i) == '\"') {
                    s1.append("\\");
                    s1.append(s.charAt(i));
                }
                else
                    s1.append(s.charAt(i));
            }
            rrrd.setRemark(s1.toString());
            model.addAttribute("model", rrrd);
            model.addAttribute("contentPage", "resource/category/rsCategoryInfoDialog");
        } catch (Exception e) {

Hos-resource/src/main/java/com/yihu/ehr/resource/service/impl/RsResourceServiceImpl.java

@@ -114,7 +114,8 @@ public class RsResourceServiceImpl extends BaseHttpService implements IRsResourc
    }
    @Transactional
    public void updateRsResource(RsResource rs) throws Exception {
    public void
    updateRsResource(RsResource rs) throws Exception {
        RsResource rsResourceEntrty = rsResourceDao.getResourceById(rs.getId());
        rsResourceEntrty.setCategory(rs.getCategory());
        rsResourceEntrty.setServiceRate(rs.getServiceRate());

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/dimension/dimensioncatetory/editorDimensionCatetory.jsp

@@ -5,11 +5,11 @@
<div id="div_info_form" class="m-form-inline" >
    <div class="m-form-group">
        <label>维度类别名称：</label>
        <label><span class="red">*&nbsp;</span>维度类别名称：</label>
        <div class="m-form-control">
            <div class="l-text">
                <input type="text" class="l-text-field required" placeholder="请输入维度类别名称" data-attr-scan="name"/>
                <input type="text" class="l-text-field required" placeholder="请输入维度类别名称" name="name"/>
            </div>
        </div>
    </div>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/dimension/dimensioncatetory/editorDimensionCatetoryJs.jsp

@@ -16,30 +16,31 @@
        },
        initForm: function () {
            var me = this;
            me.$form.attrScan();
            var modelString = "${model.id}";
            var data;
            if(modelString!=undefined && modelString!=null && modelString.length>0)
            {
                me.$form.Fields.fillValues({
                data={
                    id: "${model.id}",
                    name: "${model.name}",
                });
                };
                me.actionUrl = "${contextRoot}/dimension/updateDimensionCatetroy";
            }
            editorDimensionCate.validator =  new $.jValidation.Validation(editorDimensionCate.$form, {immediate: true, onSubmit: false,
                onElementValidateForAjax:function(elm){
                }
            };
            this.$form.ligerAutoForm({
                data: data,
                validate: {
                    name: "required",
                },
            });
        },
        bindEvents: function () {
            var me = this;
            $("#btnSave").click(function () {
                if(!editorDimensionCate.validator.validate()){
                if(!me.$form.ligerAutoForm("validate")){
                    return;
                }
                var data = me.$form.Fields.getValues();
                var data = me.$form.ligerAutoForm("validate");
                $.ajax({ //ajax处理
                    type: "POST",
                    url : me.actionUrl,

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourcebrowse/resourceJs.jsp

@@ -86,6 +86,7 @@
        },
        layoutInit: function () {
            //初始化layout
            debugger
            $resourcelayout = $("#div_wrapper").ligerLayout({
                height: "99%",
                leftWidth: 200,

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceManageJs.jsp

@@ -176,7 +176,7 @@
                params={
                    id: id,
                    mode: mode,
                    categoryId:rsResoureManege.$resourceTreeId};
                    };
            }
            else {
                title = '注册/新增资源';
@@ -226,7 +226,10 @@
        },
        dialogCallBack: function (message) {
            $.ligerDialog.success(message);
            rsResoureManege.reloadGridSearch();
            rsResoureManege.grid.set({
                parms: {categoryId:rsResoureManege.$resourceTreeId}
            });
            rsResoureManege.grid.reload();
            rsResoureManege.appInfoDialog.close();
        }
    }

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourcerest/resourceRestJs.jsp

@@ -98,6 +98,7 @@
                            if(data.successFlg) {
                                $.ligerDialog.success(data.message);
                                resourceRest.$dictGrid.reload();
                                resourceRest.$dictGrid.changePage("first");
                            }
                            else{
                                $.ligerDialog.error(data.message);
@@ -144,6 +145,7 @@
                            if(data.successFlg) {
                                $.ligerDialog.success(data.message);
                                resourceRest.$dictItemGrid.reload();
                                resourceRest.$dictItemGrid.changePage("first");
                            }
                            else{
                                $.ligerDialog.error(data.message);
@@ -161,8 +163,10 @@
            $.ligerDialog.success(message);
            if("1"==reloadType){
                resourceRest.$dictGrid.reload();
                resourceRest.$dictGrid.changePage("first");
            }else{
                resourceRest.$dictItemGrid.reload();
                resourceRest.$dictItemGrid.changePage("first");
            }
            this.$dialog.close();
        },
@@ -192,7 +196,13 @@
                    resourceRest.editorResourceRestDialog(data.id);
                },
                onSelectRow:function(rowdata, rowid, rowobj) {
                    resourceRest.$dictItemGrid.loadServerData({resourceRestId:rowdata.id});
                    //resourceRest.$dictItemGrid.loadServerData({resourceRestId:rowdata.id});
                   // resourceRest.$dictItemGrid.changePage("first");
                    resourceRest.$dictItemGrid.set({
                        parms: {resourceRestId:rowdata.id}
                    });
                    resourceRest.$dictItemGrid.reload();
                    resourceRest.$dictItemGrid.changePage("first");
                }
            });
            this.$dictItemGrid= this.$dictItemGrid.ligerGrid({

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

@@ -8,21 +8,11 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="utf-8" %>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<style type="text/css">
    .l-grid-tree-space
    {
        width:18px;
        height: 40px;
        line-height: 40px;
        overflow:hidden;
        float:left;
    }
</style>
<!-- ####### 页面部分 ####### -->
<div class="m-content">
    <!-- ####### 查询条件部分 ####### -->
    <form id="dataForm" class="m-form-inline">
    <form class="m-form-inline">
        <div class="m-form-group">
            <div class="m-form-control">
                <input type="text" id="inp_search" name="inp_search" placeholder="请输入适配方案/适配方案版本名称"  style="font-size: 12px;"
@@ -35,8 +25,8 @@
                </div>
            </div>
        </div>
        <input type="hidden" id="hd_url" value="${contextRoot}"/>
    </form>
    <!--######适配方案信息表######-->
    <div id="div_cda_type_grid" ></div>
    <input type="hidden" id="hd_url" value="${contextRoot}"/>
</div>

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

@@ -1,18 +0,0 @@
<%--
  Created by IntelliJ IDEA.
  User: llh
  Date: 2016/1/6
  Time: 14:05
  To change this template use File | Settings | File Templates.
--%>
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<style>
  input,#cdaVersion {
    font-family: SimSun;
    font-size: 14px;
    height: 30px;
    width: 240px;
  }
</style>

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

@@ -109,41 +109,22 @@
      if (u.grid == null) {
        //$.LigerGridEx.config(
        u.grid = $("#div_cda_type_grid").ligerGrid({
          record: 'totalCount',
          root: 'detailModelList',
          pageSize:10,
          pagesizeParmName: 'rows',
          heightDiff: -10,
          headerRowHeight: 40,
          rowHeight: 40,
          editorTopDiff: 41,
          allowAdjustColWidth: true,
          usePager: false,
          scrollToPage: false,
          columns: u.columns,
          data: gridData,
          height: "100%",
          rownumbers: false,
          checkbox: false,
          root: 'Rows',
          tree: {
            // columnId: 'deptName',
            columnName: 'name',
            idField: 'id',
            parentIDField: 'pid'
          },
          onError: function (a, b) {
          },
          onGroupExtend: function () {
          }
        });
      }
      else {
        u.grid.reload(gridData);
      }
      // 自适应宽度
     // u.grid.adjustToWidth();
      u.grid.expandAll();//展开全部expandAll()； 收缩全部collapseAll()
    //  window.grid = u.grid;
    },

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

@@ -113,10 +113,7 @@
          root: 'detailModelList',
          pageSize:10,
          pagesizeParmName: 'rows',
          heightDiff: -10,
          headerRowHeight: 40,
          rowHeight: 40,
          editorTopDiff: 41,
          allowAdjustColWidth: true,
          usePager: false,
          scrollToPage: false,

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

@@ -67,10 +67,10 @@
      this.$search.ligerSearch({onClick: function (value) {
        standard.list.getTypeList();
      }});
      this.getTypeList();
      this.event();
    },
    getTypeList: function () {
      var u = standard.list;
      var type = $("#type").val();
@@ -115,18 +115,11 @@
        u.grid = $("#div_cda_type_grid").ligerGrid({
          record: 'totalCount',
          root: 'detailModelList',
          pageSize:15,
          pagesizeParmName: 'rows',
          heightDiff: -10,
          headerRowHeight: 40,
          rowHeight: 40,
          editorTopDiff: 41,
          allowAdjustColWidth: true,
          usePager: false,
          scrollToPage: false,
          //scrollToPage: false,
          columns: u.columns,
          data: gridData,
          height: "100%",
          rownumbers: false,
          checkbox: false,
          root: 'Rows',