Merge branch 'master' of chenyj/cyj into master

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

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

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

@@ -39,8 +39,8 @@ public class CrawlerController {
    private AdapterSchemeService adapterSchemeService;
    /*
任务编排
*/
       任务编排
    */
    @RequestMapping("jobLayout")
    public String jobLayout(Model model) {
        model.addAttribute("contentPage", "/crawler/jobLayout");

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

@@ -126,17 +126,17 @@ public class CrawlerService {
        List<CrawlerDatasetResultDetailModel> list = new ArrayList<>();
        for (AdapterDatasetModel datasetModel : adapterDatasetModelList) {
            if (!StringUtil.isStrEmpty(datasetModel.getAdapterDatasetCode())){
                List<AdapterMetadataModel> metadatas = adapterMetadataService.getAdapterMetadataByDataset(versionModel.getVersion(), datasetModel.getId());
                List<AdapterMetadataModel> metadatas = adapterMetadataService.getAdapterMetadataByDataset(versionModel.getVersion(), datasetModel.getStdDatasetId());
            if (metadatas != null && metadatas.size() > 0) {
                CrawlerDatasetResultDetailModel obj = new CrawlerDatasetResultDetailModel();
                obj.setSchemeVersionId(schemeVersionId);
                obj.setDatasetId(datasetModel.getId());
                obj.setDatasetId(datasetModel.getStdDatasetId());
                obj.setDatasetCode(datasetModel.getStdDatasetCode());
                obj.setDatasetName(datasetModel.getStdDatasetName());
                obj.setSchemeId(datasetModel.getSchemeId());
                if (crawlerDataset != null && crawlerDataset.size() > 0) {
                    for (CrawlerDataSetModel cDataSet : crawlerDataset) {
                        if (cDataSet.getDatasetId().equals(datasetModel.getId())) {
                        if (cDataSet.getDatasetId().equals(datasetModel.getStdDatasetId())) {
                            obj.setSchemeVersionId(cDataSet.getSchemeVersionId());
                            obj.setChecked("1");
                            break;
@@ -335,7 +335,7 @@ public class CrawlerService {
                MappingDataset obj = new MappingDataset();
//                for (CrawlerDataSetModel cDataSet : crawlerDataset) {
                    if ( !StringUtil.isStrEmpty(datasetModel.getAdapterDatasetCode())) {
                        List<MappingMetadata> metadatas = getMappingMetaDatasByDataset(versionModel.getVersion(), datasetModel.getAdapterDatasetId());
                        List<MappingMetadata> metadatas = getMappingMetaDatasByDataset(versionModel.getVersion(), datasetModel.getStdDatasetId());
                        obj.setId(datasetModel.getStdDatasetId());
                        obj.setCode(datasetModel.getStdDatasetCode());
                        obj.setName(datasetModel.getStdDatasetName());

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

@@ -453,7 +453,7 @@ public class AdapterDatasetService extends SQLGeneralDAO {
                return null;
            }
            SqlCreator sqlCreator = new SqlCreator(AdapterDatasetModel.class);
            sqlCreator.inCondition("id", datasetIdList);
            sqlCreator.inCondition("stdDatasetId", datasetIdList);
            String sql = sqlCreator.selectData(adapterVersion.getDataSetTableName());
            Query query = getQuery(sqlCreator, sql);
            return query.list();

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

@@ -384,7 +384,7 @@ public class AdapterMetadataService extends SQLGeneralDAO {
    public List getAdapterMetadataByDataset(String adapterVersion,Integer datasetId){
        Map<String,Object> map = new HashMap<String,Object>();
        map.put("adapterDatasetId", datasetId);
        map.put("stdDatasetId", datasetId);
        String tableName="adapter_metadata_"+adapterVersion;
        List<AdapterMetadataModel> metadataModelList = getList(AdapterMetadataModel.class,tableName,  net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
        return metadataModelList;
@@ -392,7 +392,7 @@ public class AdapterMetadataService extends SQLGeneralDAO {
    public AdapterDatasetModel getAdapterDataset(String adapterVersion,Integer datasetId){
        Map<String,Object> map = new HashMap<String,Object>();
        map.put("id", datasetId);
        map.put("stdDatasetId", datasetId);
        String tableName="adapter_dataset_"+adapterVersion;
        AdapterDatasetModel datasetModel= (AdapterDatasetModel)get(AdapterDatasetModel.class,tableName,  datasetId);
        return datasetModel;

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/crawler/datasetDetailJs.jsp

@@ -111,8 +111,14 @@
              //修改缓存数据集ID和数据集编码的值
              parent.jobLayout.cacheDatasetIdList[pcurIndex]= dataSetIds;
              parent.jobLayout.cacheDatasetCodeList[pcurIndex]= datasetCodes;
              debugger
              if(!parent.validAdd.validate()){
                  parent.jobLayout.dialog.close(); //关闭窗口
                  return false;
              }
              parent.jobLayout.dialog.close(); //关闭窗口
          });
          $("#btn_close").click(function () {
              parent.jobLayout.dialog.close(); //关闭窗口

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

@@ -173,7 +173,6 @@
      standard.list.showDialog(_tital, _url, 500, 500, callback);
    },
    addVersion: function (pid,id,name,code,rowindex,type) {
      var _tital = "";
      if(type =="0"){
        _tital = "新增标准版本";
@@ -182,13 +181,16 @@
      }else{
        _tital = "标准版本信息";
      }
      standard.list.grid.select(rowindex);//选中行
      var row = standard.list.grid.getParent(standard.list.grid.getSelectedRow());
      if(row!=null){//是父节点
        name = $.parseJSON(JSON.stringify(row)).name;//获取父节点的标准名称
      if(row!=null) {//是父节点
        code = $.parseJSON(JSON.stringify(row)).code;
        if(type != "0") {
          name = $.parseJSON(JSON.stringify(row)).name;//获取父节点的标准名称
        }
      }
      debugger;
      var _url = standard.list._url + "/integration/versionUpdate?standardId="+pid+"&id=" + id+"&name="+name+"&type="+type+"&code="+code;
      var callback = function () {
        standard.list.getTypeList();

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

@@ -21,7 +21,6 @@
        validator: null,
        baseversion_select: null,
        init: function () {
          var id = $.Util.getUrlQueryString('id').replace("standard","");
          var standardId = $.Util.getUrlQueryString('standardId')==null?"":$.Util.getUrlQueryString('standardId').replace("standard","");
          var name = $.Util.getUrlQueryString('name');
@@ -33,7 +32,6 @@
          $("#txt_stdname").text(name);
          $("#txt_stdcode").text(code);
          $("#txt_seestdname").text(name);
            debugger;
          if(type=="0"){//新增
            this.$addform.show();
@@ -45,8 +43,8 @@
            $("#div_abaseVersion").hide();
            this.getStandardVersionInfo(id,type);
          }else{//查看
            this.$seeform.show();debugger;
            this.getStandardVersionInfo(id,type);
            this.$seeform.show();
            this.getStandardVersionInfo(id,type,code);
          }
          this.event();
@@ -56,7 +54,7 @@
            }
          });
        },
        getStandardVersionInfo: function (versionId,type) {//获取标准版本信息
        getStandardVersionInfo: function (versionId,type,code) {//获取标准版本信息
          var u = standard.version;
            versionId = Number(versionId.replace("version",""));
            $("#versionId").val(versionId+"");
@@ -71,8 +69,7 @@
                        u.getBaseVersionList($("#standardId").val(),type);//获取基础版本下拉框信息
                        if(type == ""){//查看标准版本信息
                            $("#lbl_version").text(u._getData.version);
                            $("#lbl_version").text(code);
                            $("#lbl_primaryVersion").text(u._getData.primaryVersion);
                            <%
                             SystemUser user = (SystemUser) session.getAttribute("userInfo");
@@ -148,7 +145,6 @@
                  var data = standard.version._getData;
                  data.name = jsonString.name;
                  resultData = data;
                  resultData.publishTime = new Date(resultData.publishTime);
                  _url = standard.version._url+"/standardCenter/updateVersion";
              }