Merge branch 'master' of chenyj/cyj into master

Hos-Framework/src/main/java/com/yihu/ehr/framework/common/dao/SQLGeneralDAO.java

@@ -415,7 +415,7 @@ public class SQLGeneralDAO implements XSQLGeneralDAO {
    public Object get(Class tClass, String tableName, Integer id) {
        SqlCreator sqlCreator = new SqlCreator(tClass);
        sqlCreator.equalCondition("stdDatasetId", id);
        sqlCreator.equalCondition("id", id);
        String sql = sqlCreator.selectData(tableName);
        Query query = getQuery(sqlCreator, sql);
        return query.uniqueResult();

Hos-resource/src/main/java/com/yihu/ehr/crawler/service/CrawlerService.java

@@ -197,7 +197,7 @@ public class CrawlerService {
                            CrawlerDataSetModel dataSetModel = new CrawlerDataSetModel();
                            dataSetModel.setSchemeId(Integer.valueOf(schemeId));
                            dataSetModel.setSchemeVersionId(versionModel.getId());
                            dataSetModel.setDatasetId(model.getId());
                            dataSetModel.setDatasetId(model.getStdDatasetId());
                            dataSetModel.setDatasetCode(model.getStdDatasetCode());
                            dataSetModel.setDatasetName(model.getStdDatasetName());
                            crawlerDatasetDao.saveEntity(dataSetModel);

Hos-resource/src/main/java/com/yihu/ehr/datacollect/service/DatacollectManager.java

@@ -279,7 +279,7 @@ public class DatacollectManager implements IDatacollectManager {
            obj.setCode(jsonItem.getString("adapterMetadataCode"));
            obj.setText(jsonItem.getString("adapterMetadataName"));
            obj.setType(jsonItem.getString("adapterMetadataType"));
            obj.setDict(jsonItem.getString("adapterDictId"));
            obj.setDict(jsonItem.getString("stdDictId"));
            list.add(obj);
        }

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

@@ -285,8 +285,8 @@ public class AdapterMetadataService extends SQLGeneralDAO {
            detailModel.setStdMetadataName(model.getStdMetadataName());
            if (stdMetaDataModelMap.get(model.getAdapterMetadataId()) != null) {
                detailModel.setAdapterMetadataType(stdMetaDataModelMap.get(model.getAdapterMetadataId()).getColumnType());
                detailModelList.add(detailModel);
            }
            detailModelList.add(detailModel);
        }
        return detailModelList;
    }
@@ -396,8 +396,8 @@ public class AdapterMetadataService extends SQLGeneralDAO {
        Map<String,Object> map = new HashMap<String,Object>();
        map.put("stdDatasetId", datasetId);
        String tableName="adapter_dataset_"+adapterVersion;
        AdapterDatasetModel datasetModel= (AdapterDatasetModel)get(AdapterDatasetModel.class,tableName,  datasetId);
        return datasetModel;
        List<AdapterDatasetModel> datasetModel = getList(AdapterDatasetModel.class,tableName,  net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
        return datasetModel.get(0);
    }
    public AdapterMetadataModel getAdapterMetadata(String version, Integer adapterMetadataId) {
        try {

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

@@ -620,21 +620,25 @@
                    }
                    //判断是否设置轮询字段和字段类型
                    var selected = me.$listDataset.getSelectedRows();
                    for(var i=0;i<selected.length;i++)
                    {
                        if(selected[i].jobDatasetKey!= undefined && selected[i].jobDatasetKey.length>0 && selected[i].jobDatasetKeytype!= undefined && selected[i].jobDatasetKeytype.length>0)
                    //判断是否设置轮询字段和字段类型   档案上传不校验 @modify by cyj
                    if($('#jobContentClass').ligerComboBox("getValue")!=me.archiveUpload) {
                        var selected = me.$listDataset.getSelectedRows();
                        for(var i=0;i<selected.length;i++)
                        {
                            if(selected[i].jobDatasetKey!= undefined && selected[i].jobDatasetKey.length>0 && selected[i].jobDatasetKeytype!= undefined && selected[i].jobDatasetKeytype.length>0)
                            {
                        }
                        else{
                            $.ligerDialog.error(selected[i].jobDatasetName+"未设置轮询字段！");
                            return false;
                            }
                            else{
                                $.ligerDialog.error(selected[i].jobDatasetName+"未设置轮询字段！");
                                return false;
                            }
                        }
                    }
                    return true;
                }
                default :

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

@@ -1,4 +1,4 @@
<%--
<%@ page import="com.yihu.ehr.system.model.SystemUser" %><%--
  Created by IntelliJ IDEA.
  User: llh
  Date: 2016/1/7
@@ -19,8 +19,12 @@
    TypeSearch: null,
    $search: $('#inp_search'),
    init: function () {
      this.top = $.Util.getTopWindowDOM();
      <%
                SystemUser user = (SystemUser) session.getAttribute("userInfo");
                String systemName = user.getUserName();
           %>
      var userName = "<%=systemName%>";
      //CDA 列名
      this.columns = [
        { display: '标准编码', name: 'code', hide:true},
@@ -32,7 +36,17 @@
            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) {
          if(rowdata.publisher == '') {
            rowdata.publisher = userName;
            if(rowdata.status==1 && rowdata.type=="2"){
              return rowdata.publisher;
            }
          }else {
            return rowdata.publisher;
          }
        } },
        { display: '发布时间', name: 'date', width: '20%',align: 'center',render: function (rowdata, rowindex, value) {
          if(!Util.isStrEmpty(rowdata.date)){
            return (rowdata.date+"").substring(0,19);
@@ -42,7 +56,6 @@
        {
          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;\" onclick='standard.list.add(\"" + rowdata.id + "\",\"" + rowdata.name + "\",\"" + rowdata.code + "\",\"" + rowindex + "\", \"0\")'>新增标准</a>";
            html += "<a class=\"m-btn-view\" onclick='standard.list.addPublisher(\"" + rowdata.id + "\", \"modify\")'></a> ";
@@ -198,6 +211,7 @@
      standard.list.showDialog(_tital, _url, 500, 500, callback);
    },
    releaseVersion: function (versionId,publisher) {
      debugger
      versionId = parseInt(versionId.replace("version", ""));
      var  _text = "确定唯一发布当前版本？";
      $.ligerDialog.confirm(_text, function (confirm) {
@@ -206,7 +220,7 @@
            url: standard.list._url + "/standardCenter/publishVersion",
            type: "get",
            dataType: "json",
            data: {versionId: versionId,publisher:""},
            data: {versionId: versionId,publisher:publisher},
            success: function (data) {
              if(data.successFlg){
                $.ligerDialog.success(data.message);

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

@@ -20,6 +20,11 @@
    $search: $('#inp_search'),
    init: function () {
      this.top = $.Util.getTopWindowDOM();
      <%
                SystemUser user = (SystemUser) session.getAttribute("userInfo");
                String systemName = user.getUserName();
           %>
      var userName = "<%=systemName%>";
      //CDA 列名
      this.columns = [
        { display: '标准编码', name: 'code', hide:true},
@@ -33,13 +38,13 @@
          }
        }},
        { 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;
          if(rowdata.publisher == '') {
            rowdata.publisher = userName;
            if(rowdata.status==1 && rowdata.type=="2"){
              return rowdata.publisher;
            }
          }else {
            return rowdata.publisher;
          }
        } },
        { display: '发布时间', name: 'date', width: '20%' ,  align: 'center',render: function (rowdata, rowindex, value) {