Merge branch 'master' of lulihong0928/esb into master

Hos-Framework/src/main/java/com/yihu/ehr/framework/util/sql/RequestParamTransformer.java

@@ -2,6 +2,7 @@ package com.yihu.ehr.framework.util.sql;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.JsonNodeType;
import com.yihu.ehr.framework.constrant.ErrorCode;
import com.yihu.ehr.framework.exception.ApiException;
import com.yihu.ehr.framework.util.operator.StringUtil;
@@ -87,15 +88,20 @@ public class RequestParamTransformer {
    public static Map parseJsonToMap(String condition) {
        ObjectMapper objectMapper = new ObjectMapper();
        HashMap<String, String> map = new HashMap<String, String>();
        HashMap<String, Object> map = new HashMap<String, Object>();
        if (!StringUtil.isEmpty(condition)) {
            try {
                JsonNode jsonNode = objectMapper.readTree(condition);
                Iterator<String> fileNames = jsonNode.fieldNames();
                while (fileNames.hasNext()) {
                    String fieldName = fileNames.next();
                    String value = jsonNode.get(fieldName).asText();
                    map.put(fieldName, value);
                    JsonNode valueNode = jsonNode.get(fieldName);
                    if (valueNode.getNodeType().equals(JsonNodeType.NUMBER)) {
                        map.put(fieldName, jsonNode.get(fieldName).asInt());
                    } else {
                        map.put(fieldName, jsonNode.get(fieldName).asText());
                    }
                }
            } catch (IOException e) {
                e.printStackTrace();

Hos-resource/src/main/java/com/yihu/ehr/standard/service/standard/StandardService.java

@@ -95,7 +95,7 @@ public class StandardService extends SQLGeneralDAO {
    }
    public Boolean standardCodeValidate(String code) {
        Map<String, String> query = new HashMap<>();
        Map<String, Object> query = new HashMap<>();
        Map<String, String> order = new HashMap<>();
        query.put("code", code);
@@ -107,7 +107,7 @@ public class StandardService extends SQLGeneralDAO {
    }
    public Boolean standardNameValidate(String name) {
        Map<String, String> query = new HashMap<>();
        Map<String, Object> query = new HashMap<>();
        Map<String, String> order = new HashMap<>();
        query.put("name", name);
@@ -407,13 +407,13 @@ public class StandardService extends SQLGeneralDAO {
        saveEntity(standardModel);
    }
    private List<StandardModel> getList(Map<String, String> query, Map<String, String> order, Integer limit, Integer offset) {
    private List<StandardModel> getList(Map<String, Object> query, Map<String, String> order, Integer limit, Integer offset) {
        Session session = getCurrentSession();
        Criteria criteria = session.createCriteria(StandardModel.class);
        for (String key : query.keySet()) {
            if (key.equals("type")) {
                Integer type = Integer.parseInt(query.get(key));
                Integer type = (Integer) query.get(key);
                String code = getStandardParam(Constants.STANDARD).getCode();
                if (type == 0) {
                    criteria.add(Restrictions.eq("code", code));

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/dataMapping.jsp

@@ -1,13 +1,6 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<script src="${contextRoot}/develop/lib/jobMapping/jquery-1.9.1.js"></script>
<script src="${contextRoot}/develop/lib/jobMapping/draggabilly.js"></script>
<script src="${contextRoot}/develop/lib/jobMapping/fabric.js"></script>
<script src="${contextRoot}/develop/lib/jobMapping/sly.js"></script>
<script src="${contextRoot}/develop/lib/jobMapping/underscore.js"></script>
<script src="${contextRoot}/develop/lib/jobMapping/data.js"></script>
<script src="${contextRoot}/develop/lib/jobMapping/tableViewer.js"></script>
<style id="style-1-cropbar-clipper">
    .table { width: 100%; max-width: 100%; margin-bottom: 20px; }
@@ -34,7 +27,7 @@
<!--footer start-->
<div class="m-form-bottom" style="z-index: 30">
    <div id="btn_cancel" class="l-button l-button-no">
    <div id="btn_close" class="l-button l-button-no">
        <span>关闭</span>
    </div>
    <div id="btn_save" class="l-button">
@@ -44,5 +37,5 @@
<!--end footer-->
<script>
    $('#main').tableViewer(remoteData);
</script>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/dataMappingJs.jsp

@@ -1,5 +1,24 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<script src="${contextRoot}/develop/lib/jobMapping/jquery-1.9.1.js"></script>
<script src="${contextRoot}/develop/lib/jobMapping/draggabilly.js"></script>
<script src="${contextRoot}/develop/lib/jobMapping/fabric.js"></script>
<script src="${contextRoot}/develop/lib/jobMapping/sly.js"></script>
<script src="${contextRoot}/develop/lib/jobMapping/underscore.js"></script>
<script src="${contextRoot}/develop/lib/jobMapping/data.js"></script>
<script src="${contextRoot}/develop/lib/jobMapping/tableViewer.js"></script>
<script>
    (function(win,$) {
        $('#main').tableViewer(remoteData);
        $("#btn_close").click(function () {
           // JSON.stringify($.TableView.curTV.getResult())
            parent.jobLayout.dialog.close();
        });
        $("#btn_save").click(function () {
        });
    })(window, jQuery);
</script>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/jobLayoutJs.jsp

@@ -3,6 +3,12 @@
<script>
    /* ************************** 全局变量定义 **************************** */
    var Util = $.Util;
    var schemeVersionList = [];
    /* *************************** 自定义模块 ***************************** */
    var jobLayout = {
        dialog:null,
@@ -12,11 +18,56 @@
            $('.m-retrieve-area').show();
            $.ajax({
                url: '${contextRoot}/datacollect/getJobLayout',
                type: "get",
                dataType: "json",
                success: function (data) {
                    debugger
                    if(!Util.isStrEmpty(data)){
                        schemeVersionList = data || [];
                    }else{
                        $.ligerDialog.error(data.message);
                    }
                },
                error: function (jqXHR, textStatus, errorThrown) {
                    $.ligerDialog.error("获取适配方案版本列表失败！")
                }
            });
            me.grid = $("#div_grid").ligerGrid({
                url: '${contextRoot}/datacollect/getJob',
//                usePager: false,
                columns: [
                    {display:'适配方案',name:'schemeAndVersion', width: '20%'},
                    {display:'版本',name:'jobPlan',width: '20%'},
                    {display:'适配方案',name:'schemeAndVersion', width: '20%',render: function (row, rowindex, value, column) {
                        debugger
                        var select= '<select class="sel-scheme-id form-control"  id="schemeId'+rowindex+'" style="margin-top:3px;font-size:12px;"><option value="">请选择</option>';
                        for(var i=0;i<schemeVersionList.length;i++){
                            select+='<option value="'+schemeVersionList[i].id+'">'+schemeVersionList[i].name+'</option>';
                        }
                        select = $(select+"</select>");
                        $('option[value="'+row.schemeId+'"]',select).attr('selected',true);
                        return  select.prop("outerHTML");
                    }},
                    {display:'版本',name:'jobPlan',width: '20%',render: function (row, rowindex, value, column) {
                        debugger
                        var select= '<select class="sel-version-id form-control"  id="versionId'+rowindex+'" style="margin-top:3px;font-size:12px;"><option value="">请选择</option>';
                        var versionList = [];
                        for(var i=0;i<schemeVersionList.length;i++){
                            versionList = schemeVersionList[i].versionList;
                            for(var j=0;j<versionList.length;j++){
                                select+='<option value="'+versionList[j].id+'">'+versionList[j].name+'</option>';
                            }
                        }
                        select = $(select+"</select>");
                        $('option[value="'+row.schemeId+'"]',select).attr('selected',true);
                        return  select.prop("outerHTML");
                    }},
                    {display:'数据集名称',name:'jobDataset', width: '40%'},
                    {display:'操作', name: 'operator', width: '20%', render: function (row) {
                        var html = '<div class="m-inline-buttons" style="width:55px;">';
@@ -25,8 +76,22 @@
                        return html;
                    }}
                ],
                onDblClickRow : function (row){
                    me.editor(row.id);
                onAfterShowData: function (gridData) {//显示完数据事件
                    //【应用数据元编码】change事件
                    $(".sel-scheme-id").on("change", function(event,msg) {
                        var rowIndex = $(this).attr("id").replace("orgId","");
                        var option = '<option value="">请选择</option>';
                        for(var i=0;i<datasourceList.length;i++){
                            if(datasourceList[i].orgId==$(this).val()){
                                option+='<option value="'+datasourceList[i].id+'">'+datasourceList[i].name+'</option>';
                            }
                        }
                        $("#datasourceId"+rowIndex).html("");
                        $("#datasourceId"+rowIndex).append(option);
                    });
                }
            });

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

@@ -141,7 +141,7 @@
            var standardId = $("#sel_stdId").ligerGetComboBoxManager().getValue();
            if(!Util.isStrEmpty(standardId)){
              //平台标准版本
              $("#sel_stdVersion").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getVersions?standardId="+standardId ,
              $("#sel_stdVersion").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getVersions?standardId="+standardId+"&condition="+JSON.stringify({"publishStatus":1}) ,
                cancelable:false,
                onSuccess:function(data){
@@ -194,10 +194,10 @@
            var standardId = $("#sel_adapterStdId").ligerGetComboBoxManager().getValue();
            //应用标准版本
            if(!Util.isStrEmpty(standardId)){
              $("#sel_adapterStdVersion").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getVersions?standardId="+standardId ,
              $("#sel_adapterStdVersion").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getVersions?standardId="+standardId +"&condition="+JSON.stringify({"publishStatus":1}) ,
                cancelable:false,
                onSuccess:function(data){
                  
                  if( $("#sel_adapterStdVersion").val()=="" &&data!=null&&data.length>0)
                  {
                    this.selectValue(data[0].code);

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

@@ -44,7 +44,7 @@
          display: '操作', isSort: false, width: '20%', align: 'center', render: function (rowdata, rowindex, value) {
          var html = '<div class="m-inline-buttons" style="width:200px;">';
          if(rowdata.type=="0"){//行数据为机构数据
              html += '<a href="#" style=\"width: 80px;\"id="btn_add_std" onclick="standard.list.add(\'\',\'\',\'\',\'\')">新增标准</a>';
              html += '<a href="#" style="width: 80px;"onclick="standard.list.add(\'\',\'\',\'\', \'\')">新增标准</a>';
          }
          else if(rowdata.type=="1"){//行数据为标准数据
              html += '<a href="#" style="width: 80px;" onclick="standard.list.addVersion(\''+rowdata.id+'\',\''+rowdata.name+'\',\''+rowdata.code+'\',\''+rowindex+'\',\'0\')">新增版本</a>';
@@ -130,9 +130,7 @@
          onError: function (a, b) {
          },
          onAfterShowData: function (data) {
             if($("#div_cda_type_gridgrid").find(".l-grid-body-table tr").eq(1).length>0){//机构下已有标准数据，则”新增标准“按钮隐藏
                  $("#btn_add_std").hide();
             }
          }
        });
@@ -155,7 +153,10 @@
      });
    },
    add: function (id,name,description, type) {
      
        if($("#div_cda_type_gridgrid").find(".l-grid-body-table tr").eq(1).length>0){//机构下已有标准数据，则”新增标准“按钮隐藏
          $.ligerDialog.error("当前已有集成标准，无法新增！");
          return false;
       }
      var _tital = type=="modify"?"修改标准":"新增标准";
      var _url = type=="modify"?standard.list._url + "/integration/standardUpdate?type=modify&typeFlg=0&standardId="+id:standard.list._url + "/integration/standardUpdate?typeFlg=0";
      var callback = function () {

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

@@ -64,7 +64,7 @@
                  type: "get",
                  dataType: "json",
                  success: function (data) {
                      $("#txt_code").val(data);
                      $("#txt_code").val(data.code);
                      $("#div_code").addClass("m-form-readonly");
                  },
                  error: function (jqXHR, textStatus, errorThrown) {

Hos-resource/src/main/webapp/develop/lib/ligerui/skins/custom/css/all.css

@@ -197,4 +197,6 @@ td.l-filter-rowlastcell{vertical-align:top;line-height:27px;}
/********* tip重写 *************/
.l-verify-tip-corner{top:12px;}
.l-verify-tip-content{line-height:30px;padding-top:0px;padding-bottom:0px;}
.l-verify-tip-content{line-height:30px;padding-top:0px;padding-bottom:0px;}
.f-pl5{padding-left: 5px;}