修改业务资源联动bug

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

@@ -81,9 +81,13 @@ public class RsResourceRestController {
            String page = StringUtils.isEmpty(request.getParameter("page"))?"1":request.getParameter("page");
            String rows = StringUtils.isEmpty(request.getParameter("rows"))?"10":request.getParameter("rows");
            String resourceRestId = request.getParameter("resourceRestId");
            String id = request.getParameter("id");
            String resourceRestName = request.getParameter("resourceRestName");
            DataGridResult result = new DataGridResult(Integer.valueOf(page), Integer.valueOf(rows));
            Map<String, Object> conditionMap = new HashMap<>();
            conditionMap.put("resourceRestId",resourceRestId);
            conditionMap.put("id",id);
            conditionMap.put("resourceRestName",resourceRestName);
            result = resourceRestService.getResourceRestDetilList(conditionMap, Integer.valueOf(page), Integer.valueOf(rows));
            return result;
        } catch (Exception e) {

Hos-resource/src/main/java/com/yihu/ehr/resource/dao/impl/RsResourceRestDetailDaoImpl.java

@@ -20,8 +20,11 @@ public class RsResourceRestDetailDaoImpl extends SQLGeneralDAO implements IRsRes
        StringBuilder sb = new StringBuilder();
        sb.append(" from RsResourceRestDetail r ");
        sb.append(" where 1=1 ");
        if (!StringUtils.isEmpty(conditionMap.get("resourceRestName"))) {
            sb.append(" and r.name like '%" + conditionMap.get("resourceRestName") + "%'");
        }
        if (!StringUtils.isEmpty(conditionMap.get("resourceRestId"))) {
            sb.append(" and r.name like '%" + conditionMap.get("resourceRestId") + "%'");
            sb.append(" and r.resourceRestId = '" + conditionMap.get("resourceRestId") + "'");
        }
        return super.getDataGridResult(sb.toString(), page, rows);
    }

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

@@ -12,8 +12,6 @@
        $dictGrid: $("#dict_grid"),//字典datagrid
        $dictItemGrid: $("#dictItem_grid"),//字典datagrid
        $dialog:null,
        grid:null,
        grid1:null,
        init: function () {
            this.initLayout();
            this.initButton();
@@ -35,20 +33,25 @@
        },
        initButton: function () {
            $("#dictname").ligerSearch({
            resourceRest.$dictname.ligerSearch({
                width: 200,onClick: function (value) {
                    resourceRest.grid.set({
                    resourceRest.$dictGrid.set({
                        parms: {categoryId: $("#dictname").val()}
                    });
                    resourceRest.grid.reload();
                    resourceRest.grid.changePage("first");
                    resourceRest.$dictGrid.reload();
                    resourceRest.$dictGrid.changePage("first");
                }
            });
            this.$dictItemName.ligerSearch({
            resourceRest.$dictItemName.ligerSearch({
                width: 200,onClick: function (value) {
                    var selectRow=resourceRest.$dictGrid.getSelectedRow();
                    var param={resourceRestName: $("#dictItemName").val()};
                    if(selectRow){
                        param.resourceRestId=selectRow.id;
                    }
                    resourceRest.$dictItemGrid.set({
                        parms: {resourceRestId: $("#dictItemName").val()}
                        parms: param
                    });
                    resourceRest.$dictItemGrid.reload();
                    resourceRest.$dictItemGrid.changePage("first");
@@ -164,7 +167,7 @@
            this.$dialog.close();
        },
        initGrid: function () {
            this.grid=$("#dict_grid").ligerGrid({
            this.$dictGrid=this.$dictGrid.ligerGrid({
                url: '${contextRoot}/resourceRest/getResourceRestList',
                columns: [
                    {display: '业务资源名称', name: 'name', width: '25%'},
@@ -183,7 +186,7 @@
                checkbox: false,
                heightDiff: -10,
                headerRowHeight: 40,
                height:"99%",
                height:"96%",
                rowHeight: 40,
                onDblClickRow:function(data,rowid,rowdata) {
                    resourceRest.editorResourceRestDialog(data.id);
@@ -210,7 +213,7 @@
                ],
                alternatingRow: false,
                checkbox: false,
                height:"99%",
                height:"96%",
                heightDiff: -10,
                onDblClickRow:function(data,rowid,rowdata) {
                    resourceRest.editorResourceRestDetailDialog(data.id);