Merge branch 'master' of chenyj/cyj into master

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

@@ -319,6 +319,9 @@ public class RsResourceController extends BaseController {
                result.setCurrPage(Integer.valueOf(currPage));
                result.setPageSize(Integer.valueOf(pageSize));
                result.setSuccessFlg(true);
            } else {
                result.setSuccessFlg(false);
                result.setMessage("获取数据失败");
            }
        } catch (Exception e) {
            e.printStackTrace();

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

@@ -328,8 +328,11 @@ public class RsResourceServiceImpl implements IRsResourceService {
    public String searchRomoteResourceList(String code, Map<String, Object> params) throws Exception {
        String result = HttpHelper.getByGateway(code, params).getBody();
        JSONObject jsonobject = JSONObject.fromObject(result);
        String response_params = (String) jsonobject.get("responseResult");
        return response_params;
        Object response_params = jsonobject.get("responseResult");
        if (response_params.equals("null")) {
            return "";
        }
        return (String) response_params;
    }
    @Override

Hos-resource/src/main/resources/config/http.properties

@@ -1,6 +1,6 @@
httpUrl = https://172.19.103.73:443/api/v1.0
#ÖŇhttps://192.168.131.15:4432/api/v1.0
httpUrl = http://172.19.103.73:1443/api/v1.0
#\uFFFD\uFFFDhttps://192.168.131.15:4432/api/v1.0
  #https://172.19.103.73:443/api/v1.0

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

@@ -200,6 +200,8 @@
                    for (var rowid in this.records)
                        this.unselect(rowid);
                    this.select(rowindex);
                },onAfterShowData: function () {
                    this.select(0);
                }
            });

Hos-resource/src/main/webapp/develop/lib/ligerui/custom/ligerOverwrite.js

@@ -587,6 +587,25 @@
                }
            }
        },
        queryByTextInRe: function (text) {
            var $g = this, p = this.options;
            //先清除颜色
            var nodeText = $("span", $g.tree);
            for (var j = 0; j < nodeText.length;j++) {
                $(nodeText[j]).removeAttr('style');
                $(nodeText[j]).closest("div").removeClass("l-selected");
            }
            for (var i = 0; i < nodeText.length; i++) {
                if ($(nodeText[i]).text().indexOf(text) >= 0) {
                    var id = $(nodeText[i]).closest("li").attr("id");
                    $g.expandNode(id);
                    // $g.selectNode(id);
                    $(nodeText[i]).attr('style','color:#3194d5');
                }
            }
        },
        /**
         * expandNode:根据id打开节点
         * @param id