Merge branch 'master' of zlf/esb into master

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

@@ -2,6 +2,9 @@ package com.yihu.ehr.crawler.service;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.crawler.dao.CrawlerDatasetDao;
import com.yihu.ehr.crawler.dao.CrawlerFlowDao;
import com.yihu.ehr.crawler.dao.CrawlerFlowHeadDao;
import com.yihu.ehr.crawler.model.adapter.AdapterDataSet;
import com.yihu.ehr.crawler.model.config.SysConfig;
import com.yihu.ehr.crawler.model.flow.CrawlerDataSetModel;
@@ -35,6 +38,7 @@ public class CrawlerFlowManager {
    private Boolean adapterFlg;
    private List<Patient> patientList;
    public CrawlerFlowManager() {
        adapterFlg = false;
        dispatch = DataCollectDispatcher.getInstance();
    }
@@ -181,53 +185,66 @@ public class CrawlerFlowManager {
    public Boolean getDataForPrepare() {
        if (!adapterFlg) {
            /**
             * 获取适配数据集
             */
            adapterDataSetMap = new HashMap<>();
            AdapterSchemeVersionService adapterSchemeVersionService = SpringBeanUtil.getService(AdapterSchemeVersionService.BEAN_ID);
            AdapterSchemeVersionModel adapterSchemeVersionModel = adapterSchemeVersionService.getEhrAdapterVersionLasted();
            if (adapterSchemeVersionModel == null) {
                return false;
            }
            List<CrawlerDataSetModel> crawlerDataSetModelList = new ArrayList<>();
            List<Integer> datasetIdList = new ArrayList<>();
            for (CrawlerDataSetModel crawlerDataSetModel : crawlerDataSetModelList) {
                datasetIdList.add(crawlerDataSetModel.getDatasetId());
            }
            String version = adapterSchemeVersionModel.getVersion();
            AdapterVersion adapterVersion = new AdapterVersion(version);
            AdapterDatasetService adapterDatasetService = SpringBeanUtil.getService(AdapterDatasetService.BEAN_ID);
            List<AdapterDatasetModel> adapterDataSetModelList = adapterDatasetService.getListByAdapterDatasetIdList(adapterVersion, datasetIdList);
            for (AdapterDatasetModel adapterDatasetModel : adapterDataSetModelList) {
                adapterDataSetMap.put(adapterDatasetModel.getStdDatasetCode(), new AdapterDataSet(adapterDatasetModel, adapterVersion));
            }
            /**
             * 获取采集流程表头
             */
            crawlerFlowHeadModelList = new ArrayList<>();
            List<CrawlerFlowModel> crawlerFlowModelList = new ArrayList<>();
            crawlerFlowDatasetMap = new HashMap<>();
            crawlerFlowMetadataMap = new HashMap<>();
            for (CrawlerFlowModel crawlerFlowModel : crawlerFlowModelList) {
                List<CrawlerFlowModel> datasetList = new ArrayList<>();
                List<CrawlerFlowModel> metadataList = new ArrayList<>();
                String inputDatasetCode = crawlerFlowModel.getInputDatasetCode();
                String datasetCode = crawlerFlowModel.getDatasetCode();
                if (StringUtil.isEmpty(inputDatasetCode)) {
                    continue;
            try {
                /**
                 * 获取EHR最新发布版本
                 */
                adapterDataSetMap = new HashMap<>();
                AdapterSchemeVersionService adapterSchemeVersionService = SpringBeanUtil.getService(AdapterSchemeVersionService.BEAN_ID);
                AdapterSchemeVersionModel adapterSchemeVersionModel = adapterSchemeVersionService.getEhrAdapterVersionLasted();
                if (adapterSchemeVersionModel == null) {
                    return false;
                }
                if (crawlerFlowDatasetMap.containsKey(inputDatasetCode)) {
                    datasetList = crawlerFlowDatasetMap.get(inputDatasetCode);
                /**
                 * 获取该版本下数据集
                 */
                CrawlerDatasetDao crawlerDatasetDao = SpringBeanUtil.getService(CrawlerDatasetDao.BEAN_ID);
                List<CrawlerDataSetModel> crawlerDataSetModelList = crawlerDatasetDao.getCrawlerDatasetList(adapterSchemeVersionModel.getId());
                if (CollectionUtil.isEmpty(crawlerDataSetModelList)) {
                    return false;
                }
                List<Integer> datasetIdList = new ArrayList<>();
                for (CrawlerDataSetModel crawlerDataSetModel : crawlerDataSetModelList) {
                    datasetIdList.add(crawlerDataSetModel.getDatasetId());
                }
                datasetList.add(crawlerFlowModel);
                crawlerFlowMetadataMap.put(datasetCode, datasetList);
                if (crawlerFlowDatasetMap.containsKey(datasetCode)) {
                    metadataList = crawlerFlowDatasetMap.get(datasetCode);
                String version = adapterSchemeVersionModel.getVersion();
                AdapterVersion adapterVersion = new AdapterVersion(version);
                AdapterDatasetService adapterDatasetService = SpringBeanUtil.getService(AdapterDatasetService.BEAN_ID);
                List<AdapterDatasetModel> adapterDataSetModelList = adapterDatasetService.getListByAdapterDatasetIdList(adapterVersion, datasetIdList);
                for (AdapterDatasetModel adapterDatasetModel : adapterDataSetModelList) {
                    adapterDataSetMap.put(adapterDatasetModel.getStdDatasetCode(), new AdapterDataSet(adapterDatasetModel, adapterVersion));
                }
                /**
                 * 获取采集流程表头
                 */
                CrawlerFlowHeadDao crawlerFlowHeadDao = SpringBeanUtil.getService(CrawlerFlowHeadDao.BEAN_ID);
                CrawlerFlowDao crawlerFlowDao = SpringBeanUtil.getService(CrawlerFlowDao.BEAN_ID);
                crawlerFlowHeadModelList = crawlerFlowHeadDao.getCrawlerFlowHeadList(adapterSchemeVersionModel.getId());
                List<CrawlerFlowModel> crawlerFlowModelList = crawlerFlowDao.getCrawlerFlowList(adapterSchemeVersionModel.getId());
                crawlerFlowDatasetMap = new HashMap<>();
                crawlerFlowMetadataMap = new HashMap<>();
                for (CrawlerFlowModel crawlerFlowModel : crawlerFlowModelList) {
                    List<CrawlerFlowModel> datasetList = new ArrayList<>();
                    List<CrawlerFlowModel> metadataList = new ArrayList<>();
                    String inputDatasetCode = crawlerFlowModel.getInputDatasetCode();
                    String datasetCode = crawlerFlowModel.getDatasetCode();
                    if (StringUtil.isEmpty(inputDatasetCode)) {
                        continue;
                    }
                    if (crawlerFlowDatasetMap.containsKey(inputDatasetCode)) {
                        datasetList = crawlerFlowDatasetMap.get(inputDatasetCode);
                    }
                    datasetList.add(crawlerFlowModel);
                    crawlerFlowMetadataMap.put(datasetCode, datasetList);
                    if (crawlerFlowDatasetMap.containsKey(datasetCode)) {
                        metadataList = crawlerFlowDatasetMap.get(datasetCode);
                    }
                    metadataList.add(crawlerFlowModel);
                    crawlerFlowDatasetMap.put(datasetCode, metadataList);
                }
                metadataList.add(crawlerFlowModel);
                crawlerFlowDatasetMap.put(datasetCode, metadataList);
            } catch (Exception e) {
                return false;
            }
        }
        return true;

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

@@ -91,7 +91,9 @@ public class CrawlerManager {
            Map<String, AdapterDataSet> dataSetMap = new HashMap<>();
            Map<String, JsonNode> dataMap = new HashMap<>();
            for (String key : adapterDataSetMap.keySet()) {
                //collectData
                /**
                 * 获取数据
                 */
                AdapterDataSet adapterDataSet = adapterDataSetMap.get(key);
                String data = dispatch.fecthData(patient, adapterDataSet);
                if (StringUtil.isEmpty(data)) {
@@ -135,23 +137,27 @@ public class CrawlerManager {
    public Boolean getDataForPrepare() {
        if (!adapterFlg) {
            adapterDataSetMap = new HashMap<>();
            AdapterSchemeVersionService adapterSchemeVersionService = SpringBeanUtil.getService(AdapterSchemeVersionService.BEAN_ID);
            AdapterSchemeVersionModel adapterSchemeVersionModel = adapterSchemeVersionService.getEhrAdapterVersionLasted();
            if (adapterSchemeVersionModel == null) {
                return false;
            }
            String version = adapterSchemeVersionModel.getVersion();
            AdapterVersion adapterVersion = new AdapterVersion(version);
            AdapterDatasetService adapterDatasetService = SpringBeanUtil.getService(AdapterDatasetService.BEAN_ID);
            Map<String, String> condition = new HashMap<>();
            condition.put("column", "adapter_dataset_code");
            JSONObject jsonpObject = JSONObject.fromObject(condition);
            List<AdapterDatasetModel> adapterDataSetModelList = adapterDatasetService.getAdapterDatasetNotNullList(adapterVersion, jsonpObject.toString());
            for (AdapterDatasetModel adapterDatasetModel : adapterDataSetModelList) {
                adapterDataSetMap.put(adapterDatasetModel.getStdDatasetCode(), new AdapterDataSet(adapterDatasetModel, adapterVersion));
            try {
                adapterDataSetMap = new HashMap<>();
                AdapterSchemeVersionService adapterSchemeVersionService = SpringBeanUtil.getService(AdapterSchemeVersionService.BEAN_ID);
                AdapterSchemeVersionModel adapterSchemeVersionModel = adapterSchemeVersionService.getEhrAdapterVersionLasted();
                if (adapterSchemeVersionModel == null) {
                    return false;
                }
                String version = adapterSchemeVersionModel.getVersion();
                AdapterVersion adapterVersion = new AdapterVersion(version);
                AdapterDatasetService adapterDatasetService = SpringBeanUtil.getService(AdapterDatasetService.BEAN_ID);
                Map<String, String> condition = new HashMap<>();
                condition.put("column", "adapter_dataset_code");
                JSONObject jsonpObject = JSONObject.fromObject(condition);
                List<AdapterDatasetModel> adapterDataSetModelList = adapterDatasetService.getAdapterDatasetNotNullList(adapterVersion, jsonpObject.toString());
                for (AdapterDatasetModel adapterDatasetModel : adapterDataSetModelList) {
                    adapterDataSetMap.put(adapterDatasetModel.getStdDatasetCode(), new AdapterDataSet(adapterDatasetModel, adapterVersion));
                }
                adapterFlg = true;
            } catch (Exception e) {
                adapterFlg = false;
            }
            adapterFlg = true;
        }
        return adapterFlg;
    }

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

@@ -421,8 +421,17 @@ public class AdapterSchemeVersionService extends SQLGeneralDAO {
        String adapterSchemeVersionHql = "SELECT ID AS id,VERSION AS version,SCHEME_ID AS schemeId,NAME AS name FROM ADAPTER_SCHEME_VERSION WHERE PUBLISH_TIME=(select max(PUBLISH_TIME) from ADAPTER_SCHEME_VERSION WHERE SCHEME_ID = :schemeId)";
        Query adapterSchemeVersionQuery = getCurrentSession().createSQLQuery(adapterSchemeVersionHql);
        adapterSchemeVersionQuery.setParameter("schemeId", adapterSchemeModel.getId());
        AdapterSchemeVersionModel version = (AdapterSchemeVersionModel) adapterSchemeVersionQuery.uniqueResult();
        return version;
        Object[] object = (Object[]) adapterSchemeVersionQuery.uniqueResult();
        if (object != null) {
            AdapterSchemeVersionModel adapterSchemeVersionModel = new AdapterSchemeVersionModel();
            adapterSchemeVersionModel.setId((Integer) object[0]);
            adapterSchemeVersionModel.setVersion((String) object[1]);
            adapterSchemeVersionModel.setSchemeId((Integer) object[2]);
            adapterSchemeVersionModel.setName((String) object[3]);
            return adapterSchemeVersionModel;
        } else {
            return null;
        }
    }
    public AdapterSchemeModel getEhrAdapter() {

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

@@ -135,15 +135,13 @@ public class StdMetadataService extends SQLGeneralDAO {
                stdMetaDataModel.setSuccessFlg(true);
                stdMetaDataModel.setMessage("修改数据元成功");
                return stdMetaDataModel;
            } else {
                return Result.error("已存在标准数据元编码");
            }
        } catch (Exception e) {
            e.printStackTrace();
        }
        if (existFlg) {
            return Result.error("已存在标准数据元编码");
        } else {
            return Result.error("修改数据元失败");
        }
        return Result.error("修改数据元失败");
    }
    public Result get(String stdVersion, Integer metadataId) {

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

@@ -48,17 +48,17 @@
            html += "<a class=\"m-btn-view\" onclick='standard.list.addPublisher(\"" + rowdata.id + "\", \"modify\")'></a> ";
//            html += "<a class=\"m-btn-delete\" onclick='standard.list.deleted(\"" + rowdata.id + "\",\"" + rowdata.name + "\",\"" + rowindex + "\")'></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>";
            html += "<a href='#' style=\"width: 80px;\" onclick='standard.list.addVersion(\"" + rowdata.pid + "\",\"" + rowdata.id + "\",\"" + rowdata.name + "\",\"" + rowdata.code + "\",\"" + rowindex + "\", \"0\")'>新增版本</a>";
            html +=  "<a class=\"m-btn-edit\" onclick='standard.list.add(\"" + rowdata.id + "\",\"" + rowdata.name + "\",\"" + rowdata.code + "\",\"" + rowdata.description + "\", \"modify\")'></a> ";
            html +=  "<a class=\"m-btn-delete\"  onclick='standard.list.deleted(\"" + rowdata.id + "\",\"" + rowdata.name + "\",\"" + rowindex + "\")'></a>";
          } else if(rowdata.type=="2"){//版本数据
            if(rowdata.status!=0){//已发布版本
              html +=  "<a href='#' style=\"width: 80px;\" onclick='standard.list.config(\"" + rowdata.code + "\",\"" + rowdata.pid + "\",\"" + rowdata.status + "\",\"" + rowindex + "\")'>查看配置</a>";
              html +=  "<a href='#' class=\"m-btn-view\"  onclick='standard.list.addVersion(\"" + rowdata.id + "\",\"" + rowdata.name + "\",\"" + rowdata.code + "\",\"" + rowindex + "\", \"\")'></a>";
              html +=  "<a href='#' class=\"m-btn-view\"  onclick='standard.list.addVersion(\"" + rowdata.pid + "\",\"" + rowdata.id + "\",\"" + rowdata.name + "\",\"" + rowdata.code + "\",\"" + rowindex + "\", \"\")'></a>";
            }else{//未发布版本
              html += "<a href='#' style=\"width: 55px;\" onclick='standard.list.releaseVersion(\"" + rowdata.id + "\", \"" + rowdata.publisher + "\")'>发布</a>";
              html += "<a href='#' onclick='standard.list.config(\"" + rowdata.code + "\",\"" + rowdata.pid + "\",\"" + rowdata.status + "\",\"" + rowindex + "\")'>配置</a>";
              html += "<a class=\"m-btn-edit\" onclick='standard.list.addVersion(\"" + rowdata.id + "\",\"" + rowdata.name + "\",\"" + rowdata.code + "\",\"" + rowindex + "\", \"1\")'></a> ";
              html += "<a class=\"m-btn-edit\" onclick='standard.list.addVersion(\"" + rowdata.pid + "\",\"" + rowdata.id + "\",\"" + rowdata.name + "\",\"" + rowdata.code + "\",\"" + rowindex + "\", \"1\")'></a> ";
              html += "<a class=\"m-btn-delete\" onclick='standard.list.deleted(\"" + rowdata.id + "\",\"" + rowdata.name + "\",\"" + rowindex + "\")'></a>";
            }
          }
@@ -172,7 +172,7 @@
      };
      standard.list.showDialog(_tital, _url, 500, 500, callback);
    },
    addVersion: function (id,name,code,rowindex,type) {
    addVersion: function (pid,id,name,code,rowindex,type) {
      var _tital = "";
      if(type =="0"){
@@ -188,7 +188,8 @@
      if(row!=null){//是父节点
        name = $.parseJSON(JSON.stringify(row)).name;//获取父节点的标准名称
      }
      var _url = standard.list._url + "/integration/versionUpdate?id=" + id+"&name="+name+"&type="+type+"&code="+code;
      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/dataset/updateMetadata.jsp

@@ -47,7 +47,7 @@
      </tr>
      <tr>
        <td>
          <label>内部编码:</label>
          <label>数据元标识符:</label>
        </td>
        <td class="btn-isnull td-left">
          <input type="text" id="inp_deCode" class="required validate-special-char f-pl5" style="width: 240px;" data-attr-scan="deCode"/>

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

@@ -14,6 +14,7 @@
  (function ($, win) {
        var standard = {};
        var Util = $.Util;
        var dictId = "";
        //集成标准版本处理
        standard.metadata = {
@@ -34,7 +35,6 @@
              type:"post",
              dataType: "json",
              success:function (data) {
                debugger;
                if(data.successFlg){
                  var option = "";
                  var list = data.detailModelList;
@@ -42,7 +42,10 @@
                    option += '<option value="' +list[i].code+'">'+list[i].value+'</option>';
                  }
                  $("#sel_dict").html(option);
                  $("#sel_dict").val(dictId);
                  $("#sel_dict").select2();
                  $("#see_dict").text($("#sel_dict").find("option:selected").text());
                }
              }
@@ -78,6 +81,7 @@
                        columnLength:data.columnLength
                      });
                      dictId = data.dictId==null?"":data.dictId;
                      $("#ck_primaryKey").prop('checked', false);
                      if (data.primaryKey == 1) {
                        $("#ck_primaryKey").prop('checked', true);
@@ -91,13 +95,12 @@
                      u.$type_form.Fields.fillValues({
                        dictId:data.dictId==0?"":data.dictId,
                      });
                      dictId = data.dictId==null?"":data.dictId;
                      $("#see_name").text(data.name);
                      $("#see_type").text(data.type);
                      $("#see_code").text(data.code);
                      $("#see_format").text(data.format);
                      $("#see_deCode").text(data.deCode);
                      $("#see_dict").text($("#sel_dict").ligerComboBox().getText());
                      $("#see_definition").text(data.definition);
                      $("#see_columnName").text(data.columnName);
                      $("#see_columnLength").text(data.columnLength);
@@ -146,7 +149,7 @@
            dataJson[0]["standardId"] = Number(standardId);
            dataJson[0]["primaryKey"] = $("#ck_primaryKey").prop("checked")==true?1:0;
            dataJson[0]["nullable"] = $("#ck_nullable").prop("checked")==true?1:0;
            debugger
            dataJson[0]["dictId"] = $("#sel_dict").val();
            if($("#type").val()=="modify"){//修改
              _url = $("#hd_url").val() + "/standardCenter/updateMetadata";
              dataJson[0]["id"] = Number(id);

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

@@ -56,17 +56,17 @@
              html += "<a class=\"m-btn-view\" onclick='standard.list.addPublisher(\"" + rowdata.id + "\", \"modify\")'></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>';
              html += '<a href="#" style="width: 80px;" onclick="standard.list.addVersion(\''+rowdata.pid+'\',\''+rowdata.id+'\',\''+rowdata.name+'\',\''+rowdata.code+'\',\''+rowindex+'\',\'0\')">新增版本</a>';
              html += '<a class="m-btn-edit" onclick="standard.list.add(\''+rowdata.id+'\',\''+rowdata.name+'\',\''+rowdata.description+'\', \'modify\')"></a>';
              html += '<a class="m-btn-delete" onclick="standard.list.deleted(\''+rowdata.id+'\',\''+rowdata.name+'\',\''+rowindex+'\')"></a>';
          }else{//版本数据
            if(rowdata.status!=0){//已发布版本
              html += '<a  href="#" style="width: 80px;" onclick="standard.list.config(\''+rowdata.code+'\',\''+rowdata.pid+'\',\''+rowdata.status+'\',\''+rowindex+'\')">查看配置</a>';
              html += '<a class="m-btn-view" onclick="standard.list.addVersion(\''+rowdata.id+'\',\''+rowdata.name+'\',\''+rowdata.code+'\',\''+rowindex+'\',\'\')"></a>';
              html += '<a class="m-btn-view" onclick="standard.list.addVersion(\''+rowdata.pid+'\',\''+rowdata.id+'\',\''+rowdata.name+'\',\''+rowdata.code+'\',\''+rowindex+'\',\'\')"></a>';
            }else{//未发布版本
              html += '<a  href="#" style="width: 55px;" onclick="standard.list.releaseVersion(\''+rowdata.id+'\',\''+rowdata.publisher+'\')">发布</a>';
              html += '<a  href="#" onclick="standard.list.config(\''+rowdata.code+'\',\''+rowdata.pid+'\',\''+rowdata.status+'\',\''+rowindex+'\')">配置</a>';
              html += '<a class="m-btn-edit" onclick="standard.list.addVersion(\''+rowdata.id+'\',\''+rowdata.name+'\',\''+rowdata.code+'\',\''+rowindex+'\',\'1\')"></a>';
              html += '<a class="m-btn-edit" onclick="standard.list.addVersion(\''+rowdata.pid+'\',\''+rowdata.id+'\',\''+rowdata.name+'\',\''+rowdata.code+'\',\''+rowindex+'\',\'1\')"></a>';
              html += '<a class="m-btn-delete" onclick="standard.list.deleted(\''+rowdata.id+'\',\''+rowdata.name+'\',\''+rowindex+'\')"></a>';
            }
          }
@@ -174,7 +174,7 @@
      };
      standard.list.showDialog(_tital, _url, 500, 500, callback);
    },
    addVersion: function (id,name,code,rowindex,type) {
    addVersion: function (pid,id,name,code,rowindex,type) {
      var _tital = "";
      var standardId = "";
@@ -192,7 +192,7 @@
        code = $.parseJSON(JSON.stringify(row)).code;//获取父节点的标准名称
        standardId = $.parseJSON(JSON.stringify(row)).id;
      }
      var _url = _url = standard.list._url + "/integration/versionUpdate?id=" + id+"&name="+name+"&type="+type+"&code="+code+"&standardId="+standardId;
      var _url = _url = standard.list._url + "/integration/versionUpdate?standardId="+pid+"&id=" + id+"&name="+name+"&type="+type+"&code="+code+"&standardId="+standardId;
      var callback = function () {
        standard.list.getTypeList();
      };

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

@@ -35,7 +35,7 @@
  <div class="m-form-group" style="display: none;" id="div_baseVersion">
    <label>基础版本名称：</label>
    <div class="m-form-control">
      <label type="text" class="f-w240 f-pl5" id="lbl_baseVersion" style="text-align: left"/>
      <label type="text" class="f-w240 f-pl5" id="lbl_baseVersion" style="text-align: left;width: 240px;"/>
    </div>
  </div>
  <div class="m-form-group" style="display: none;" id="div_publisher">
@@ -73,7 +73,7 @@
  <div class="m-form-group">
    <label>标准版本名称：</label>
    <div class="l-text-wrapper m-form-control">
      <label type="text" class="required f-w240 " id="lbl_seename" style="text-align: left"/>
      <label type="text" class="required f-w240 " id="lbl_seename" style="text-align: left;width: 240px;"/>
    </div>
  </div>
  <div class="m-form-group">
@@ -110,5 +110,6 @@
</div>
<input type="hidden" id="id" value=""/>
<input type="hidden" id="standardId" value=""/>
<input type="hidden" id="type" value=""/>
<input type="hidden" id="hd_url" value="${contextRoot}"/>

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

@@ -29,10 +29,11 @@
          var type = $.Util.getUrlQueryString('type');
          $("#type").val(type);
          $("#id").val(id);
          $("#standardId").val(standardId);
          $("#txt_stdname").text(name);
          $("#txt_stdcode").text(code);
          $("#txt_seestdname").text(name);
            debugger;
          if(type=="0"){//新增
            this.$addform.show();
@@ -42,11 +43,9 @@
            $("#div_baseVersion").show();
            $("#div_publisher").show();
            $("#div_abaseVersion").hide();
            this.getBaseVersionList(standardId);//获取基础版本下拉框信息
            this.getStandardVersionInfo(id,type);
          }else{//查看
            this.$seeform.show();
            this.getBaseVersionList(standardId);//获取基础版本下拉框信息
            this.$seeform.show();debugger;
            this.getStandardVersionInfo(id,type);
          }
          this.event();
@@ -69,7 +68,10 @@
                success: function (data) {
                    if(data.successFlg){
                        u._getData = data;
                        u.getBaseVersionList($("#standardId").val(),type);//获取基础版本下拉框信息
                        if(type == ""){//查看标准版本信息
                            $("#lbl_version").text(u._getData.version);
                            $("#lbl_primaryVersion").text(u._getData.primaryVersion);
                            <%
@@ -89,12 +91,6 @@
                                $("#lbl_publishTime").text(u.getDate(u._getData.publishTime));
                            }
                            if($.Util.isStrEmpty(u._getData.baseVersion)){//标准版本名称
                                $("#lbl_primaryVersion").text("无");
                            }else{
                                $("#baseVersion").ligerComboBox()._setValue(u._getData.baseVersion);
                                $("#lbl_primaryVersion").text($("#baseVersion").ligerComboBox().getText());
                            }
                            if(u._getData.publishStatus==0){
                                $(".lbl_publishStatus").text("未发布");
                            }else{
@@ -107,12 +103,7 @@
                                name: u._getData.name,
                            });
                            if($.Util.isStrEmpty(u._getData.baseVersion)){
                                $("#lbl_baseVersion").text("无");
                            }else{
                                $("#baseVersion").ligerComboBox()._setValue(u._getData.baseVersion);
                                $("#lbl_baseVersion").text($("#baseVersion").ligerComboBox().getText());
                            }
                            if(u._getData.publishStatus==0){
                                $(".lbl_publishStatus").text("未发布");
                            }else{
@@ -182,10 +173,29 @@
                }
            })
        },
        getBaseVersionList: function (id) {//获取基础版本信息
        getBaseVersionList: function (id,type) {//获取基础版本信息
            var u = standard.version;
            $("#baseVersion").ligerComboBox({url : standard.version._url+"/standardCenter/getVersions?standardId="+id ,
                cancelable:false,
              });
                onSuccess:function(data){
                    debugger
                    if(type==""){//查看
                        if($.Util.isStrEmpty(u._getData.baseVersion)){//标准版本名称
                            $("#lbl_primaryVersion").text("无");
                        }else{
                            $("#baseVersion").ligerComboBox()._setValue(u._getData.baseVersion);
                            $("#lbl_primaryVersion").text($("#baseVersion").ligerComboBox().getText());
                        }
                    }else{//修改
                        if($.Util.isStrEmpty(u._getData.baseVersion)){
                            $("#lbl_baseVersion").text("无");
                        }else{
                            $("#baseVersion").ligerComboBox()._setValue(u._getData.baseVersion);
                            $("#lbl_baseVersion").text($("#baseVersion").ligerComboBox().getText());
                        }
                    }
            }});
        },
       getDate:function(time_num){
           var d = new Date(time_num);