代码冲突合并

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

@@ -61,10 +61,10 @@ public class StandardVersionService extends SQLGeneralDAO {
            List<StandardVersionModel> standardVersionModelList = getVersionList(standardId, condition, order, rows, page);
            DictionaryResult dictionaryResult = new DictionaryResult();
            List<DictItem> detailModelList = new ArrayList<DictItem>();
            DictItem item = new DictItem();
            item.setCode("");
            item.setValue("-无-");
            detailModelList.add(item);
//            DictItem item = new DictItem();
//            item.setCode("");
//            item.setValue("-无-");
//            detailModelList.add(item);
            for (StandardVersionModel standardVersionModel : standardVersionModelList) {
                DictItem items = new DictItem();
                String  id = standardVersionModel.getVersion();

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

@@ -282,7 +282,7 @@ public class StdDictService extends SQLGeneralDAO {
                JsonNode jsonNode = objectMapper.readTree(condition);
                if(jsonNode.get("initVal")!=null && !jsonNode.get("initVal").asText().isEmpty()){
                    String initName = jsonNode.get("initVal").asText();
                    sqlCreator.neCondition("code",initName);
                    sqlCreator.equalCondition("name",initName);
                }else if(jsonNode.get("name")!=null && !jsonNode.get("name").asText().isEmpty()){
                    String name = jsonNode.get("name").asText();
                    sqlCreator.likeOrCondition("code", "name", name);

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

@@ -99,27 +99,33 @@
          dataType: "json",
          data: {adapterVersion:adapterVersion,stdVersion: stdVersion},
          success: function (data) {
            var schemeDataset = data;
            for(var i = 0;i<schemeDataset.length;i++){
              var Id = schemeDataset[i].id;
              if(Id.substring(0,1)=="S"){//定制标准数据集数据（左树）
                stdDatasetData.push(schemeDataset[i]);
              }else{//定制适配数据集数据（右树）
                adapterDataSetData.push(schemeDataset[i]);
              }
            if(data.successFlg){
                var schemeDataset = data.detailModelList || [];;
                for(var i = 0;i<schemeDataset.length;i++){
                  var Id = schemeDataset[i].id;
                  if(Id.substring(0,1)=="S"){//定制标准数据集数据（左树）
                    stdDatasetData.push(schemeDataset[i]);
                  }else{//定制适配数据集数据（右树）
                    adapterDataSetData.push(schemeDataset[i]);
                  }
                }
                //来源树对象（左树）
                fromTree = self.$treeFrom.ligerTree($.extend({},defaults,{
                  data:stdDatasetData,
                  onCheck: f_onFromTreeCheck
                }));
                //目标树对象（右树）
                toTree = self.$treeTo.ligerTree($.extend({},defaults,{
                  data: adapterDataSetData,
                  onCheck: f_onToTreeCheck
                }));
            }else{
              $.ligerDialog.error(data.message);
            }
            //来源树对象（左树）
            fromTree = self.$treeFrom.ligerTree($.extend({},defaults,{
              data:stdDatasetData,
              onCheck: f_onFromTreeCheck
            }));
            //目标树对象（右树）
            toTree = self.$treeTo.ligerTree($.extend({},defaults,{
              data: adapterDataSetData,
              onCheck: f_onToTreeCheck
            }));
          }
@@ -160,13 +166,13 @@
            data: {schemeId: parseInt(self._schemeId),adapterVersion:self._adapterVersion,stdVersion:self._stdVersion,datasetIdStr:datasetIdStr,metaDataIdStr:metaDataIdStr},
            success: function (data) {
              waittingDialog.close();
              if(Util.isStrEmpty(data.message)){
                $.ligerDialog.alert("保存成功", "提示", "success", function () {
              if(data.successFlg){
                $.ligerDialog.alert(data.message, "提示", "success", function () {
                  parent.adapterplan.list.getTypeList();
                  parent.adapterplan.list.top.dialog_adapter_detail.close()
                }, null);
              }else{
                $.ligerDialog.error("保存失败！");
                $.ligerDialog.error(data.message);
              }
            },

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

@@ -12,45 +12,45 @@
  <div class="m-form-group">
    <label><span class="red">*&nbsp;</span>适配方案名称：</label>
    <div class="l-text-wrapper m-form-control ">
      <input type="text" class="required f-w240 " id="txt_name" name="name" data-attr-scan="name">
      <input type="text" class="required f-w240 f-pl5" id="txt_name" name="name" data-attr-scan="name">
    </div>
  </div>
  <div class="m-form-group">
    <label>适配方案说明：</label>
    <div class="m-form-control">
      <textarea rows="3" id="txt_description" name="txb_description" style="width: 240px;height: 60px;" name="description"  class="useTitle"></textarea>
      <textarea rows="3" id="txt_description" name="txb_description" style="width: 240px;height: 60px;" name="description"  data-attr-scan="description"  class="useTitle f-pl5"></textarea>
    </div>
  </div>
  <hr/>
  <div class="m-form-group" id="div_stdId">
    <label><span class="red">*&nbsp;</span>平台标准名称：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 " id="sel_stdId" data-type="select" name="stdId" data-attr-scan="stdId">
      <input type="text" class="required f-w240 f-pl5" id="sel_stdId" data-type="select" name="stdId" data-attr-scan="stdId">
    </div>
  </div>
  <div class="m-form-group" id="div_stdVersion">
    <label><span class="red">*&nbsp;</span>平台标准版本：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 " id="sel_stdVersion" data-type="select" name="stdVersion" data-attr-scan="stdVersion" >
      <input type="text" class="required f-w240 f-pl5" id="sel_stdVersion" data-type="select" name="stdVersion" data-attr-scan="stdVersion" >
    </div>
  </div>
  <hr/>
  <div class="m-form-group" id="div_adapterPublisherOrgCode">
    <label><span class="red">*&nbsp;</span>发布机构名称：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 " id="sel_publisherOrgCode" data-type="select" name="adapterPublisherOrgCode" data-attr-scan="adapterPublisherOrgCode">
      <input type="text" class="required f-w240 f-pl5" id="sel_publisherOrgCode" data-type="select" name="adapterPublisherOrgCode" data-attr-scan="adapterPublisherOrgCode">
    </div>
  </div>
  <div class="m-form-group" id="div_adapterStdId">
    <label><span class="red">*&nbsp;</span>应用标准名称：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 " id="sel_adapterStdId" data-type="select" name="adapterStdId" data-attr-scan="adapterStdId">
      <input type="text" class="required f-w240 f-pl5" id="sel_adapterStdId" data-type="select" name="adapterStdId" data-attr-scan="adapterStdId">
    </div>
  </div>
  <div class="m-form-group" id="div_adapterStdVersion">
    <label><span class="red">*&nbsp;</span>应用标准版本：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 " id="sel_adapterStdVersion" data-type="select" name="adapterStdVersion" data-attr-scan="adapterStdVersion">
      <input type="text" class="required f-w240 f-pl5" id="sel_adapterStdVersion" data-type="select" name="adapterStdVersion" data-attr-scan="adapterStdVersion">
    </div>
  </div>
  <div class="m-form-bottom">

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

@@ -38,6 +38,7 @@
          $("#sel_adapterStdVersion").removeClass("required");
          $(".div-essential").removeClass("essential");
          
          var schemeId = Number($.Util.getUrlQueryString('id').replace("scheme",""));
          $("#scheme_id").val(schemeId+"");
          $.ajax({
@@ -46,9 +47,8 @@
            dataType: "json",
            data: {schemeId: schemeId},
            success: function (data) {
              if(data!=null){
                
                data = data;
              
              if(data.successFlg){
                u.$form.attrScan();
                u.$form.Fields.fillValues({
                  name: data.name,
@@ -63,12 +63,10 @@
                  type:data.type,
                  status:data.status
                });
                $("#adapterStdVersion").val(data.adapterStdVersion);
                $("#sel_adapterStdId").val(data.adapterStdId);
                $("#sel_adapterStdVersion").val(data.adapterStdVersion);
                liger.get('sel_adapterStdId').selectValue(data.adapterStdId);
                liger.get('sel_adapterStdVersion').selectValue(data.adapterStdVersion);
              }else{
                $.ligerDialog.error(result.errorMsg);
                $.ligerDialog.error(data.message);
              }
            },
@@ -97,24 +95,21 @@
          }else{//新增
            _url = adapterplan.attr._url + "/adapterCenter/addScheme";
          }
          $.ajax({
            url: _url,
            dataType: "json",
            data:{scheme: JSON.stringify(dataJson[0])},
            success: function (data) {
              
              if(Util.isStrEmpty(data.message)){
                $.ligerDialog.alert("保存成功", "提示", "success", function () {
              if(data.successFlg){
                $.ligerDialog.alert(data.message, "提示", "success", function () {
                  parent.adapterplan.list.getTypeList();//刷新数据
                  parent.adapterplan.list.top.dialog_adapter_detail.close();
                }, null);
              }else if(data.message=="ehr.scheme.name.exist"){
                $.ligerDialog.error("适配方案名称已存在！");
              }else{
                $.ligerDialog.error(data.message);
              }
            },
            error: function (jqXHR, textStatus, errorThrown) {
              $.ligerDialog.error("保存失败！")
@@ -130,7 +125,7 @@
          });
          //平台标准名称
          $("#sel_stdId").ligerComboBox({url : adapterplan.attr._url+"/adapter/getStandards?condition={\"type\":0}" ,
          $("#sel_stdId").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getStandards?condition={\"type\":0}" ,
            cancelable:false,
            onSuccess:function(data){
              
@@ -146,13 +141,14 @@
            var standardId = $("#sel_stdId").ligerGetComboBoxManager().getValue();
            if(!Util.isStrEmpty(standardId)){
              //平台标准版本
              $("#sel_stdVersion").ligerComboBox({url : adapterplan.attr._url+"/adapter/getVersions?standardId="+standardId ,
              $("#sel_stdVersion").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getVersions?standardId="+standardId ,
                cancelable:false,
                onSuccess:function(data){
                  
                  if( $("#sel_stdVersion").val()=="" && data!=null&&data.length>0)
                  {
                    
                    this.selectValue(data[0].code);
                  }
                  return false;
@@ -161,7 +157,7 @@
          });
          //发布机构名称
          $("#sel_publisherOrgCode").ligerComboBox({url : adapterplan.attr._url+"/adapter/getPublishers" ,
          $("#sel_publisherOrgCode").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getPublishers" ,
            cancelable:false,
            onSuccess:function(data){
              if(data!=null&&data.length>0)
@@ -181,7 +177,7 @@
            if(!Util.isStrEmpty(publisherOrgCode)){
              //应用标准名称
              $("#sel_adapterStdId").ligerComboBox({url : adapterplan.attr._url+"/adapter/getStandards?condition={\"type\":1,\"publisherOrgCode\":\""+publisherOrgCode+"\"}" ,
              $("#sel_adapterStdId").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getStandards?condition={\"type\":1,\"publisherOrgCode\":\""+publisherOrgCode+"\"}" ,
                cancelable:false,
                onSuccess:function(data){
                  if( $("#sel_adapterStdId").val()=="" &&data!=null&&data.length>0)
@@ -198,7 +194,7 @@
            var standardId = $("#sel_adapterStdId").ligerGetComboBoxManager().getValue();
            //应用标准版本
            if(!Util.isStrEmpty(standardId)){
              $("#sel_adapterStdVersion").ligerComboBox({url : adapterplan.attr._url+"/adapter/getVersions?standardId="+standardId ,
              $("#sel_adapterStdVersion").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getVersions?standardId="+standardId ,
                cancelable:false,
                onSuccess:function(data){
                  

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

@@ -620,12 +620,14 @@
              dataType : "json",
              async:false,
              success :function(data){
                if(Util.isStrEmpty(data.message)){
                debugger
                if(data.successFlg){
                  entryMaster.reloadGrid(); //重新查询，返回json记录集
                  $.ligerDialog.success("保存成功！");
                  $.ligerDialog.success(data.message);
                }else{
                  $.ligerDialog.error("保存失败！");
                  $.ligerDialog.error(data.message);
                }
              },
              error :function(data){
                $.ligerDialog.error("保存失败！");
@@ -687,12 +689,14 @@
              dataType : "json",
              async:false,
              success :function(data){
                if(Util.isStrEmpty(data.message)){
                debugger
                if(data.successFlg){
                  entryMaster.reloadGrid(); //重新查询，返回json记录集
                  $.ligerDialog.success("保存成功！");
                  $.ligerDialog.success(data.message);
                }else{
                  $.ligerDialog.error("保存失败！");
                  $.ligerDialog.error(data.message);
                }
              },
              error :function(data){
                $.ligerDialog.error("保存失败！");
@@ -1065,50 +1069,56 @@
              url: url,
              processResults: function (data, page) {
                debugger
                if(targer=="adapterDatasetCode" || targer=="adapterMetadataCode"
                        || targer=="adapterDictCode" || targer=="adapterEntryCode" || targer=="stdEntryCode"){//由于机构适配值的数据格式为id：id+“，”+code，text：name，但是机构适配值为id:id+","+name,text:code,所以需要重新组装数据
                  var toData;
                  var toArr = [];
                  var resultData = data.detailModelList;
                  if(targer=="adapterDatasetCode" || targer=="adapterDictCode" && resultData.length>0){//查询结果有值，才填充原本选中的值
                    toArr.push({id:selectId,text:selectText});
                  }
                  for(var i=0;i<resultData.length;i++){
                    var name = resultData[i].text;
                    var id = resultData[i].id==null?"": resultData[i].id.split(",")[0]+","+name;
                    var code =  resultData[i].id==null?"": resultData[i].id.split(",")[1];
                    toData = {id: id, text: code};
                    toArr.push(toData);
                  }
                  return {
                    results:undulpicate(toArr)
                  };
                }else{//机构适配名称
                  if(targer=="adapterDatasetName" || targer=="adapterDictName"){
                    var resultData = [];
                    var detailModelList = data.detailModelList;
                    if(detailModelList.length>0){
                      resultData.push({id:selectId,text:selectText});
                if(data.successFlg){
                  if(targer=="adapterDatasetCode" || targer=="adapterMetadataCode"
                          || targer=="adapterDictCode" || targer=="adapterEntryCode" || targer=="stdEntryCode"){//由于机构适配值的数据格式为id：id+“，”+code，text：name，但是机构适配值为id:id+","+name,text:code,所以需要重新组装数据
                    var toData;
                    var toArr = [];
                    var resultData = data.detailModelList||[];
                    if(targer=="adapterDatasetCode" || targer=="adapterDictCode" && resultData.length>0){//查询结果有值，才填充原本选中的值
                      toArr.push({id:selectId,text:selectText});
                    }
                    for(var i=0;i<detailModelList.length;i++){
                      var  toData = {id: detailModelList[i].id, text: detailModelList[i].text};
                      resultData.push(toData);
                    for(var i=0;i<resultData.length;i++){
                      var name = resultData[i].text;
                      var id = resultData[i].id==null?"": resultData[i].id.split(",")[0]+","+name;
                      var code =  resultData[i].id==null?"": resultData[i].id.split(",")[1];
                      toData = {id: id, text: code};
                      toArr.push(toData);
                    }
                    return {
                      results:  undulpicate(resultData)
                    };
                  }else{
                    return {
                      results:  data.detailModelList
                      results:undulpicate(toArr)
                    };
                  }else{//机构适配名称
                    if(targer=="adapterDatasetName" || targer=="adapterDictName"){
                      var resultData = [];
                      var detailModelList = data.detailModelList;
                      if(detailModelList.length>0){
                        resultData.push({id:selectId,text:selectText});
                      }
                      for(var i=0;i<detailModelList.length;i++){
                        var  toData = {id: detailModelList[i].id, text: detailModelList[i].text};
                        resultData.push(toData);
                      }
                      return {
                        results:  undulpicate(resultData)
                      };
                    }else{
                      return {
                        results:  data.detailModelList
                      };
                    }
                  }
                }else{
                  $.ligerDialog.error(data.message);
                }
                cache: true
//                cache: true
              },
              escapeMarkup: function (markup) { return markup; }, // let our custom formatter work
              minimumInputLength: 1,

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

@@ -1,42 +0,0 @@
<%--
  Created by IntelliJ IDEA.
  User: llh
  Date: 2016/1/7
  Time: 14:06
  To change this template use File | Settings | File Templates.
--%>
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<div id="div_dataset_info_form" data-role-form class="m-form-inline f-mt20">
  <div class="m-form-group">
    <label>数据元编码：</label>
    <div class="l-text-wrapper m-form-control essential">
      <input type="text" class="f-w240 " id="txt_code" data-attr-scan="code">
    </div>
  </div>
  <div class="m-form-group">
    <label>数据源名称：</label>
    <div class="l-text-wrapper m-form-control essential">
      <input type="text" class="required f-w240 " id="txt_name" data-attr-scan="name">
    </div>
  </div>
  <div class="m-form-group">
    <label>数据集说明：</label>
    <div class="m-form-control">
      <textarea rows="3" id="txt_description" style="width: 240px;height: 60px;" data-attr-scan="description"  class="useTitle"></textarea>
    </div>
  </div>
  <div class="m-form-control pane-attribute-toolbar">
    <div class="l-button u-btn u-btn-primary u-btn-large f-ib f-vam" id="btn_save">
      <span>保存</span>
    </div>
    <div class="l-button u-btn u-btn-cancel u-btn-large f-ib f-vam close-toolbar" id="btn_close">
      <span>关闭</span>
    </div>
  </div>
  <input type="hidden" id="hdId" value=""/>
  <input type="hidden" id="hd_url" value="${contextRoot}"/>
</div>

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

@@ -1,31 +0,0 @@
<%--
  Created by IntelliJ IDEA.
  User: llh
  Date: 2016/1/7
  Time: 14:06
  To change this template use File | Settings | File Templates.
--%>
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<style type="text/css">
  .pane-attribute-toolbar{
    display: block;
    position: absolute;
    bottom: 0;
    left: 0;
    width: 100%;
    height: 50px;
    padding: 6px 0 4px;
    background-color: #fff;
    border-top: 1px solid #ccc;
    text-align: right;
  }
  .close-toolbar{
    margin-right: 20px;
  }
  input{
    height: 28px;
    width: 240px;
  }
</style>

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

@@ -1,145 +0,0 @@
<%--
  Created by IntelliJ IDEA.
  User: llh
  Date: 2016/1/7
  Time: 14:06
  To change this template use File | Settings | File Templates.
--%>
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<script >
  (function ($, win) {
      var standard = {};
      //集成标准版本处理
      standard.dataset = {
        type_form: $("#div_dataset_info_form"),
        validator: null,
        baseversion_select: null,
        init: function () {
          var id = $.Util.getUrlQueryString('id');
          var name = $.Util.getUrlQueryString('name');
          var version = $.Util.getUrlQueryString('version');
          var description = $.Util.getUrlQueryString('description');
          $("#txt_Name").text(name);
          $("#txt_version").val(version);
          $("#txt_description").val(description);
          $("#hdId").val(id);
          this.getStandardVersionInfo();
          this.event();
          this.validator =  new $.jValidation.Validation(this.type_form, {immediate: true, onSubmit: false,
            onElementValidateForAjax:function(elm){
            }
          });
        },
        getBaseVersionList: function (initValue, initText) {//获取基础版本信息
          //set.elementAttr.standard_select = $("#baseversion_select").ligerComboBox({
          //    url: set.list._url + "/std/dataset/getMetaDataDict?version=" + version,
          //    valueField: 'id',
          //    textField: 'name',
          //    selectBoxWidth: 400,
          //    autocomplete: true,
          //    keySupport: true,
          //    width: 400,
          //    initValue: initValue,
          //    initText: initText,
          //    onSuccess: function () {
          //        $("#sel_Name").css({"width": 213, "height": 28});
          //        $(".l-text-combobox").css({"width": 227});
          //        $(".l-box-select-absolute").css({"width": 227});
          //    },
          //    onAfterSetData: function () {
          //
          //    }
          //});
          //set.elementAttr.standard_select.setValue(initValue);
          //set.elementAttr.standard_select.setText(initText);
        },
        getStandardVersionInfo: function () {//获取标准版本信息
          //var u = standard.list;
          //var id = $("#hdId").val();
          //
          //if (id == "") {
          //    standard.dataset.getBaseVersionList("", "");
          //    return;
          //}
          //
          //$.ajax({
          //    url: u._url + "/cdatype/getCdaTypeById",
          //    type: "get",
          //    dataType: "json",
          //    data: {strIds: id},
          //    success: function (data) {
          //
          //        var result = eval(data);
          //        var info = result.obj;
          //        if (info != null) {
          //            standard.dataset.type_form.attrScan();
          //            standard.dataset.type_form.Fields.fillValues(info);
          //
          //            var initValue = info.parentId;
          //            var initText = info.parentName;
          //
          //            standard.dataset.getStandardList(initValue, initText);
          //        }
          //        else {
          //            $.Notice.error(result.errorMsg);
          //        }
          //    }
          //})
        },
        save: function () {
          if(!this.validator.validate()){
            return;
          }
          var id = $("#hdId").val();
          standard.dataset.type_form.attrScan();
          var dataJson = eval("[" + standard.dataset.type_form.Fields.toJsonString() + "]");
          dataJson[0]["id"] = id;
          //TODO 下面写保存标准的后台逻辑，dataJson[0]为传到后台的数据
          //var _url = standard.list._url + "/cdatype/SaveCdaType";//设置保存标准的url
          //
          //$.ajax({
          //    url: _url,
          //    type: "POST",
          //    dataType: "json",
          //    data: dataJson[0],
          //    success: function (data) {
          //        if (data != null) {
          //            var _res = eval(data);
          //            if (_res.successFlg) {
          //                $.ligerDialog.alert("保存成功", "提示", "success", function () {
          //                    parent.standard.list.top.dialog_standard_detail.close();
          //                }, null);
          //            }
          //            else {
          //                $.Notice.error(_res.errorMsg);
          //            }
          //        }
          //        else {
          //            $.Notice.error("保存失败！")
          //        }
          //    }
          //})
        },
        event: function () {
          $("#btn_save").click(function () {
            standard.dataset.save();//保存
          });
          $("#btn_close").click(function () {//关闭
            win.closeDialog();
          });
        }
      };
      $(function(){
        standard.dataset.init();
      })
  })(jQuery, window)
</script>

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

@@ -1,62 +0,0 @@
<%--
  Created by IntelliJ IDEA.
  User: llh
  Date: 2016/1/7
  Time: 14:06
  To change this template use File | Settings | File Templates.
--%>
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<div id="div_metadata_info_form" data-role-form class="m-form-inline f-mt20">
  <div class="m-form-group">
    <label>数据元编码：</label>
    <div class="l-text-wrapper m-form-control essential">
      <input type="text" class="f-w240 " id="txt_code" data-attr-scan="code">
    </div>
  </div>
  <div class="m-form-group">
    <label>数据源名称：</label>
    <div class="l-text-wrapper m-form-control essential">
      <input type="text" class="required f-w240 " id="txt_name" data-attr-scan="name">
    </div>
  </div>
  <div class="m-form-group">
    <label>数据类型：</label>
    <div class="l-text-wrapper m-form-control essential">
      <select class="f-w240 " data-attr-scan="type"  id="sel_type">
        <option>S字符型</option>
        <option>L布尔型</option>
        <option>N数值型</option>
        <option>D日期型</option>
        <option>T时间型</option>
        <option>DT日期时间型</option>
        <option>BY二进制型</option>
      </select>
    </div>
  </div>
  <div class="m-form-group">
    <label>数据格式：</label>
    <div class="l-text-wrapper m-form-control essential">
      <input type="text" class="f-w240 " id="txt_format" data-attr-scan="format">
    </div>
  </div>
  <div class="m-form-group">
    <label>数据集说明：</label>
    <div class="m-form-control">
      <textarea rows="3" id="txt_description" style="width: 240px;height: 60px;" data-attr-scan="description"  class="useTitle"></textarea>
    </div>
  </div>
  <div class="m-form-control pane-attribute-toolbar">
    <div class="l-button u-btn u-btn-primary u-btn-large f-ib f-vam" id="btn_save">
      <span>保存</span>
    </div>
    <div class="l-button u-btn u-btn-cancel u-btn-large f-ib f-vam close-toolbar" id="btn_close">
      <span>关闭</span>
    </div>
  </div>
  <input type="hidden" id="hdId" value=""/>
  <input type="hidden" id="hd_url" value="${contextRoot}"/>
</div>

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

@@ -1,31 +0,0 @@
<%--
  Created by IntelliJ IDEA.
  User: llh
  Date: 2016/1/7
  Time: 14:06
  To change this template use File | Settings | File Templates.
--%>
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<style type="text/css">
  .pane-attribute-toolbar{
    display: block;
    position: absolute;
    bottom: 0;
    left: 0;
    width: 100%;
    height: 50px;
    padding: 6px 0 4px;
    background-color: #fff;
    border-top: 1px solid #ccc;
    text-align: right;
  }
  .close-toolbar{
    margin-right: 20px;
  }
  input{
    height: 28px;
    width: 240px;
  }
</style>

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

@@ -1,145 +0,0 @@
<%--
  Created by IntelliJ IDEA.
  User: llh
  Date: 2016/1/7
  Time: 14:06
  To change this template use File | Settings | File Templates.
--%>
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<script >
  (function ($, win) {
        var standard = {};
        //集成标准版本处理
        standard.metadata = {
          type_form: $("#div_metadata_info_form"),
          validator: null,
          baseversion_select: null,
          init: function () {
            var id = $.Util.getUrlQueryString('id');
            var name = $.Util.getUrlQueryString('name');
            var version = $.Util.getUrlQueryString('version');
            var description = $.Util.getUrlQueryString('description');
            $("#txt_Name").text(name);
            $("#txt_version").val(version);
            $("#txt_description").val(description);
            $("#hdId").val(id);
            this.getStandardVersionInfo();
            this.event();
            this.validator =  new $.jValidation.Validation(this.type_form, {immediate: true, onSubmit: false,
              onElementValidateForAjax:function(elm){
              }
            });
          },
          getBaseVersionList: function (initValue, initText) {//获取基础版本信息
            //set.elementAttr.standard_select = $("#baseversion_select").ligerComboBox({
            //    url: set.list._url + "/std/dataset/getMetaDataDict?version=" + version,
            //    valueField: 'id',
            //    textField: 'name',
            //    selectBoxWidth: 400,
            //    autocomplete: true,
            //    keySupport: true,
            //    width: 400,
            //    initValue: initValue,
            //    initText: initText,
            //    onSuccess: function () {
            //        $("#sel_Name").css({"width": 213, "height": 28});
            //        $(".l-text-combobox").css({"width": 227});
            //        $(".l-box-select-absolute").css({"width": 227});
            //    },
            //    onAfterSetData: function () {
            //
            //    }
            //});
            //set.elementAttr.standard_select.setValue(initValue);
            //set.elementAttr.standard_select.setText(initText);
          },
          getStandardVersionInfo: function () {//获取标准版本信息
            //var u = standard.list;
            //var id = $("#hdId").val();
            //
            //if (id == "") {
            //    standard.metadata.getBaseVersionList("", "");
            //    return;
            //}
            //
            //$.ajax({
            //    url: u._url + "/cdatype/getCdaTypeById",
            //    type: "get",
            //    dataType: "json",
            //    data: {strIds: id},
            //    success: function (data) {
            //
            //        var result = eval(data);
            //        var info = result.obj;
            //        if (info != null) {
            //            standard.metadata.type_form.attrScan();
            //            standard.metadata.type_form.Fields.fillValues(info);
            //
            //            var initValue = info.parentId;
            //            var initText = info.parentName;
            //
            //            standard.metadata.getStandardList(initValue, initText);
            //        }
            //        else {
            //            $.Notice.error(result.errorMsg);
            //        }
            //    }
            //})
          },
          save: function () {
            if(!this.validator.validate()){
              return;
            }
            var id = $("#hdId").val();
            standard.metadata.type_form.attrScan();
            var dataJson = eval("[" + standard.metadata.type_form.Fields.toJsonString() + "]");
            dataJson[0]["id"] = id;
            //TODO 下面写保存标准的后台逻辑，dataJson[0]为传到后台的数据
            //var _url = standard.list._url + "/cdatype/SaveCdaType";//设置保存标准的url
            //
            //$.ajax({
            //    url: _url,
            //    type: "POST",
            //    dataType: "json",
            //    data: dataJson[0],
            //    success: function (data) {
            //        if (data != null) {
            //            var _res = eval(data);
            //            if (_res.successFlg) {
            //                $.ligerDialog.alert("保存成功", "提示", "success", function () {
            //                    parent.standard.list.top.dialog_standard_detail.close();
            //                }, null);
            //            }
            //            else {
            //                $.Notice.error(_res.errorMsg);
            //            }
            //        }
            //        else {
            //            $.Notice.error("保存失败！")
            //        }
            //    }
            //})
          },
          event: function () {
            $("#btn_save").click(function () {
              standard.metadata.save();//保存
            });
            $("#btn_close").click(function () {//关闭
              win.closeDialog();
            });
          }
        };
      $(function(){
        standard.metadata.init();
      })
  })(jQuery, window)
</script>

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

@@ -1,62 +0,0 @@
<%--
  Created by IntelliJ IDEA.
  User: llh
  Date: 2016/1/7
  Time: 14:06
  To change this template use File | Settings | File Templates.
--%>
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<div id="div_metadata_info_form" data-role-form class="m-form-inline f-mt20">
  <div class="m-form-group">
    <label>数据元编码：</label>
    <div class="l-text-wrapper m-form-control essential">
      <input type="text" class="f-w240 " id="txt_code" data-attr-scan="code">
    </div>
  </div>
  <div class="m-form-group">
    <label>数据源名称：</label>
    <div class="l-text-wrapper m-form-control essential">
      <input type="text" class="required f-w240 " id="txt_name" data-attr-scan="name">
    </div>
  </div>
  <div class="m-form-group">
    <label>数据类型：</label>
    <div class="l-text-wrapper m-form-control essential">
      <select class="f-w240 " data-attr-scan="type"  id="sel_type">
        <option>S字符型</option>
        <option>L布尔型</option>
        <option>N数值型</option>
        <option>D日期型</option>
        <option>T时间型</option>
        <option>DT日期时间型</option>
        <option>BY二进制型</option>
      </select>
    </div>
  </div>
  <div class="m-form-group">
    <label>数据格式：</label>
    <div class="l-text-wrapper m-form-control essential">
      <input type="text" class="f-w240 " id="txt_format" data-attr-scan="format">
    </div>
  </div>
  <div class="m-form-group">
    <label>数据集说明：</label>
    <div class="m-form-control">
      <textarea rows="3" id="txt_description" style="width: 240px;height: 60px;" data-attr-scan="description"  class="useTitle"></textarea>
    </div>
  </div>
  <div class="m-form-control pane-attribute-toolbar">
    <div class="l-button u-btn u-btn-primary u-btn-large f-ib f-vam" id="btn_save">
      <span>保存</span>
    </div>
    <div class="l-button u-btn u-btn-cancel u-btn-large f-ib f-vam close-toolbar" id="btn_close">
      <span>关闭</span>
    </div>
  </div>
  <input type="hidden" id="hdId" value=""/>
  <input type="hidden" id="hd_url" value="${contextRoot}"/>
</div>

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

@@ -1,31 +0,0 @@
<%--
  Created by IntelliJ IDEA.
  User: llh
  Date: 2016/1/7
  Time: 14:06
  To change this template use File | Settings | File Templates.
--%>
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<style type="text/css">
  .pane-attribute-toolbar{
    display: block;
    position: absolute;
    bottom: 0;
    left: 0;
    width: 100%;
    height: 50px;
    padding: 6px 0 4px;
    background-color: #fff;
    border-top: 1px solid #ccc;
    text-align: right;
  }
  .close-toolbar{
    margin-right: 20px;
  }
  input{
    height: 28px;
    width: 240px;
  }
</style>

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

@@ -1,145 +0,0 @@
<%--
  Created by IntelliJ IDEA.
  User: llh
  Date: 2016/1/7
  Time: 14:06
  To change this template use File | Settings | File Templates.
--%>
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<script >
  (function ($, win) {
        var standard = {};
        //集成标准版本处理
        standard.metadata = {
          type_form: $("#div_metadata_info_form"),
          validator: null,
          baseversion_select: null,
          init: function () {
            var id = $.Util.getUrlQueryString('id');
            var name = $.Util.getUrlQueryString('name');
            var version = $.Util.getUrlQueryString('version');
            var description = $.Util.getUrlQueryString('description');
            $("#txt_Name").text(name);
            $("#txt_version").val(version);
            $("#txt_description").val(description);
            $("#hdId").val(id);
            this.getStandardVersionInfo();
            this.event();
            this.validator =  new $.jValidation.Validation(this.type_form, {immediate: true, onSubmit: false,
              onElementValidateForAjax:function(elm){
              }
            });
          },
          getBaseVersionList: function (initValue, initText) {//获取基础版本信息
            //set.elementAttr.standard_select = $("#baseversion_select").ligerComboBox({
            //    url: set.list._url + "/std/dataset/getMetaDataDict?version=" + version,
            //    valueField: 'id',
            //    textField: 'name',
            //    selectBoxWidth: 400,
            //    autocomplete: true,
            //    keySupport: true,
            //    width: 400,
            //    initValue: initValue,
            //    initText: initText,
            //    onSuccess: function () {
            //        $("#sel_Name").css({"width": 213, "height": 28});
            //        $(".l-text-combobox").css({"width": 227});
            //        $(".l-box-select-absolute").css({"width": 227});
            //    },
            //    onAfterSetData: function () {
            //
            //    }
            //});
            //set.elementAttr.standard_select.setValue(initValue);
            //set.elementAttr.standard_select.setText(initText);
          },
          getStandardVersionInfo: function () {//获取标准版本信息
            //var u = standard.list;
            //var id = $("#hdId").val();
            //
            //if (id == "") {
            //    standard.metadata.getBaseVersionList("", "");
            //    return;
            //}
            //
            //$.ajax({
            //    url: u._url + "/cdatype/getCdaTypeById",
            //    type: "get",
            //    dataType: "json",
            //    data: {strIds: id},
            //    success: function (data) {
            //
            //        var result = eval(data);
            //        var info = result.obj;
            //        if (info != null) {
            //            standard.metadata.type_form.attrScan();
            //            standard.metadata.type_form.Fields.fillValues(info);
            //
            //            var initValue = info.parentId;
            //            var initText = info.parentName;
            //
            //            standard.metadata.getStandardList(initValue, initText);
            //        }
            //        else {
            //            $.Notice.error(result.errorMsg);
            //        }
            //    }
            //})
          },
          save: function () {
            if(!this.validator.validate()){
              return;
            }
            var id = $("#hdId").val();
            standard.metadata.type_form.attrScan();
            var dataJson = eval("[" + standard.metadata.type_form.Fields.toJsonString() + "]");
            dataJson[0]["id"] = id;
            //TODO 下面写保存标准的后台逻辑，dataJson[0]为传到后台的数据
            //var _url = standard.list._url + "/cdatype/SaveCdaType";//设置保存标准的url
            //
            //$.ajax({
            //    url: _url,
            //    type: "POST",
            //    dataType: "json",
            //    data: dataJson[0],
            //    success: function (data) {
            //        if (data != null) {
            //            var _res = eval(data);
            //            if (_res.successFlg) {
            //                $.ligerDialog.alert("保存成功", "提示", "success", function () {
            //                    parent.standard.list.top.dialog_standard_detail.close();
            //                }, null);
            //            }
            //            else {
            //                $.Notice.error(_res.errorMsg);
            //            }
            //        }
            //        else {
            //            $.Notice.error("保存失败！")
            //        }
            //    }
            //})
          },
          event: function () {
            $("#btn_save").click(function () {
              standard.metadata.save();//保存
            });
            $("#btn_close").click(function () {//关闭
              win.closeDialog();
            });
          }
        };
      $(function(){
        standard.metadata.init();
      })
  })(jQuery, window)
</script>

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

@@ -1,42 +0,0 @@
<%--
  Created by IntelliJ IDEA.
  User: llh
  Date: 2016/1/7
  Time: 14:06
  To change this template use File | Settings | File Templates.
--%>
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<div id="div_dict_info_form" data-role-form class="m-form-inline f-mt20">
  <div class="m-form-group">
    <label>字典编码：</label>
    <div class="l-text-wrapper m-form-control essential">
      <input type="text" class="f-w240 " id="txt_code" data-attr-scan="code">
    </div>
  </div>
  <div class="m-form-group">
    <label>字典名称：</label>
    <div class="l-text-wrapper m-form-control essential">
      <input type="text" class="required f-w240 " id="txt_name" data-attr-scan="name">
    </div>
  </div>
  <div class="m-form-group">
    <label>说明：</label>
    <div class="m-form-control">
      <textarea rows="3" id="txt_description" style="width: 240px;height: 60px;" data-attr-scan="description"  class="useTitle"></textarea>
    </div>
  </div>
  <div class="m-form-control pane-attribute-toolbar">
    <div class="l-button u-btn u-btn-primary u-btn-large f-ib f-vam" id="btn_save">
      <span>保存</span>
    </div>
    <div class="l-button u-btn u-btn-cancel u-btn-large f-ib f-vam close-toolbar" id="btn_close">
      <span>关闭</span>
    </div>
  </div>
  <input type="hidden" id="hdId" value=""/>
  <input type="hidden" id="hd_url" value="${contextRoot}"/>
</div>

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

@@ -1,31 +0,0 @@
<%--
  Created by IntelliJ IDEA.
  User: llh
  Date: 2016/1/7
  Time: 14:06
  To change this template use File | Settings | File Templates.
--%>
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<style type="text/css">
  .pane-attribute-toolbar{
    display: block;
    position: absolute;
    bottom: 0;
    left: 0;
    width: 100%;
    height: 50px;
    padding: 6px 0 4px;
    background-color: #fff;
    border-top: 1px solid #ccc;
    text-align: right;
  }
  .close-toolbar{
    margin-right: 20px;
  }
  input{
    height: 28px;
    width: 240px;
  }
</style>

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

@@ -1,42 +0,0 @@
<%--
  Created by IntelliJ IDEA.
  User: llh
  Date: 2016/1/7
  Time: 14:06
  To change this template use File | Settings | File Templates.
--%>
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<div id="div_dictitem_info_form" data-role-form class="m-form-inline f-mt20">
  <div class="m-form-group">
    <label>值域编码：</label>
    <div class="l-text-wrapper m-form-control essential">
      <input type="text" class="f-w240 " id="txt_code" data-attr-scan="code">
    </div>
  </div>
  <div class="m-form-group">
    <label>值域名称：</label>
    <div class="l-text-wrapper m-form-control essential">
      <input type="text" class="required f-w240 " id="txt_name" data-attr-scan="name">
    </div>
  </div>
  <div class="m-form-group">
    <label>说明：</label>
    <div class="m-form-control">
      <textarea rows="3" id="txt_description" style="width: 240px;height: 60px;" data-attr-scan="description"  class="useTitle"></textarea>
    </div>
  </div>
  <div class="m-form-control pane-attribute-toolbar">
    <div class="l-button u-btn u-btn-primary u-btn-large f-ib f-vam" id="btn_save">
      <span>保存</span>
    </div>
    <div class="l-button u-btn u-btn-cancel u-btn-large f-ib f-vam close-toolbar" id="btn_close">
      <span>关闭</span>
    </div>
  </div>
  <input type="hidden" id="hdId" value=""/>
  <input type="hidden" id="hd_url" value="${contextRoot}"/>
</div>

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

@@ -1,31 +0,0 @@
<%--
  Created by IntelliJ IDEA.
  User: llh
  Date: 2016/1/7
  Time: 14:06
  To change this template use File | Settings | File Templates.
--%>
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<style type="text/css">
  .pane-attribute-toolbar{
    display: block;
    position: absolute;
    bottom: 0;
    left: 0;
    width: 100%;
    height: 50px;
    padding: 6px 0 4px;
    background-color: #fff;
    border-top: 1px solid #ccc;
    text-align: right;
  }
  .close-toolbar{
    margin-right: 20px;
  }
  input{
    height: 28px;
    width: 240px;
  }
</style>

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

@@ -1,145 +0,0 @@
<%--
  Created by IntelliJ IDEA.
  User: llh
  Date: 2016/1/7
  Time: 14:06
  To change this template use File | Settings | File Templates.
--%>
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<script >
  (function ($, win) {
      var standard = {};
      //集成标准版本处理
      standard.version = {
        type_form: $("#div_dictitem_info_form"),
        validator: null,
        baseversion_select: null,
        init: function () {
          var id = $.Util.getUrlQueryString('id');
          var name = $.Util.getUrlQueryString('name');
          var version = $.Util.getUrlQueryString('version');
          var description = $.Util.getUrlQueryString('description');
          $("#txt_Name").text(name);
          $("#txt_version").val(version);
          $("#txt_description").val(description);
          $("#hdId").val(id);
          this.getStandardVersionInfo();
          this.event();
          this.validator =  new $.jValidation.Validation(this.type_form, {immediate: true, onSubmit: false,
            onElementValidateForAjax:function(elm){
            }
          });
        },
        getBaseVersionList: function (initValue, initText) {//获取基础版本信息
          //set.elementAttr.standard_select = $("#baseversion_select").ligerComboBox({
          //    url: set.list._url + "/std/dataset/getMetaDataDict?version=" + version,
          //    valueField: 'id',
          //    textField: 'name',
          //    selectBoxWidth: 400,
          //    autocomplete: true,
          //    keySupport: true,
          //    width: 400,
          //    initValue: initValue,
          //    initText: initText,
          //    onSuccess: function () {
          //        $("#sel_Name").css({"width": 213, "height": 28});
          //        $(".l-text-combobox").css({"width": 227});
          //        $(".l-box-select-absolute").css({"width": 227});
          //    },
          //    onAfterSetData: function () {
          //
          //    }
          //});
          //set.elementAttr.standard_select.setValue(initValue);
          //set.elementAttr.standard_select.setText(initText);
        },
        getStandardVersionInfo: function () {//获取标准版本信息
          //var u = standard.list;
          //var id = $("#hdId").val();
          //
          //if (id == "") {
          //    standard.version.getBaseVersionList("", "");
          //    return;
          //}
          //
          //$.ajax({
          //    url: u._url + "/cdatype/getCdaTypeById",
          //    type: "get",
          //    dataType: "json",
          //    data: {strIds: id},
          //    success: function (data) {
          //
          //        var result = eval(data);
          //        var info = result.obj;
          //        if (info != null) {
          //            standard.version.type_form.attrScan();
          //            standard.version.type_form.Fields.fillValues(info);
          //
          //            var initValue = info.parentId;
          //            var initText = info.parentName;
          //
          //            standard.version.getStandardList(initValue, initText);
          //        }
          //        else {
          //            $.Notice.error(result.errorMsg);
          //        }
          //    }
          //})
        },
        save: function () {
          if(!this.validator.validate()){
            return;
          }
          var id = $("#hdId").val();
          standard.version.type_form.attrScan();
          var dataJson = eval("[" + standard.version.type_form.Fields.toJsonString() + "]");
          dataJson[0]["id"] = id;
          //TODO 下面写保存标准的后台逻辑，dataJson[0]为传到后台的数据
          //var _url = standard.list._url + "/cdatype/SaveCdaType";//设置保存标准的url
          //
          //$.ajax({
          //    url: _url,
          //    type: "POST",
          //    dataType: "json",
          //    data: dataJson[0],
          //    success: function (data) {
          //        if (data != null) {
          //            var _res = eval(data);
          //            if (_res.successFlg) {
          //                $.ligerDialog.alert("保存成功", "提示", "success", function () {
          //                    parent.standard.list.top.dialog_standard_detail.close();
          //                }, null);
          //            }
          //            else {
          //                $.Notice.error(_res.errorMsg);
          //            }
          //        }
          //        else {
          //            $.Notice.error("保存失败！")
          //        }
          //    }
          //})
        },
        event: function () {
          $("#btn_save").click(function () {
            standard.version.save();//保存
          });
          $("#btn_close").click(function () {//关闭
            win.closeDialog();
          });
        }
      };
      $(function(){
        standard.version.init();
      })
  })(jQuery, window);
</script>

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

@@ -1,145 +0,0 @@
<%--
  Created by IntelliJ IDEA.
  User: llh
  Date: 2016/1/7
  Time: 14:06
  To change this template use File | Settings | File Templates.
--%>
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<script >
  (function ($, win) {
      var standard = {};
    
      //集成标准版本处理
      standard.dict = {
        type_form: $("#div_dict_info_form"),
        validator: null,
        baseversion_select: null,
        init: function () {
          var id = $.Util.getUrlQueryString('id');
          var name = $.Util.getUrlQueryString('name');
          var version = $.Util.getUrlQueryString('version');
          var description = $.Util.getUrlQueryString('description');
          $("#txt_Name").text(name);
          $("#txt_version").val(version);
          $("#txt_description").val(description);
    
    
          $("#hdId").val(id);
    
          this.getStandardVersionInfo();
          this.event();
    
          this.validator =  new $.jValidation.Validation(this.type_form, {immediate: true, onSubmit: false,
            onElementValidateForAjax:function(elm){
    
            }
          });
        },
        getBaseVersionList: function (initValue, initText) {//获取基础版本信息
          //set.elementAttr.standard_select = $("#baseversion_select").ligerComboBox({
          //    url: set.list._url + "/std/dataset/getMetaDataDict?version=" + version,
          //    valueField: 'id',
          //    textField: 'name',
          //    selectBoxWidth: 400,
          //    autocomplete: true,
          //    keySupport: true,
          //    width: 400,
          //    initValue: initValue,
          //    initText: initText,
          //    onSuccess: function () {
          //        $("#sel_Name").css({"width": 213, "height": 28});
          //        $(".l-text-combobox").css({"width": 227});
          //        $(".l-box-select-absolute").css({"width": 227});
          //    },
          //    onAfterSetData: function () {
          //
          //    }
          //});
          //set.elementAttr.standard_select.setValue(initValue);
          //set.elementAttr.standard_select.setText(initText);
        },
        getStandardVersionInfo: function () {//获取标准版本信息
    
          //var u = standard.list;
          //var id = $("#hdId").val();
          //
          //if (id == "") {
          //    standard.dict.getBaseVersionList("", "");
          //    return;
          //}
          //
          //$.ajax({
          //    url: u._url + "/cdatype/getCdaTypeById",
          //    type: "get",
          //    dataType: "json",
          //    data: {strIds: id},
          //    success: function (data) {
          //
          //        var result = eval(data);
          //        var info = result.obj;
          //        if (info != null) {
          //            standard.dict.type_form.attrScan();
          //            standard.dict.type_form.Fields.fillValues(info);
          //
          //            var initValue = info.parentId;
          //            var initText = info.parentName;
          //
          //            standard.dict.getStandardList(initValue, initText);
          //        }
          //        else {
          //            $.Notice.error(result.errorMsg);
          //        }
          //    }
          //})
        },
        save: function () {
          if(!this.validator.validate()){
            return;
          }
          var id = $("#hdId").val();
          standard.dict.type_form.attrScan();
          var dataJson = eval("[" + standard.dict.type_form.Fields.toJsonString() + "]");
          dataJson[0]["id"] = id;
          //TODO 下面写保存标准的后台逻辑，dataJson[0]为传到后台的数据
          //var _url = standard.list._url + "/cdatype/SaveCdaType";//设置保存标准的url
          //
          //$.ajax({
          //    url: _url,
          //    type: "POST",
          //    dataType: "json",
          //    data: dataJson[0],
          //    success: function (data) {
          //        if (data != null) {
          //            var _res = eval(data);
          //            if (_res.successFlg) {
          //                $.ligerDialog.alert("保存成功", "提示", "success", function () {
          //                    parent.standard.list.top.dialog_standard_detail.close();
          //                }, null);
          //            }
          //            else {
          //                $.Notice.error(_res.errorMsg);
          //            }
          //        }
          //        else {
          //            $.Notice.error("保存失败！")
          //        }
          //    }
          //})
        },
        event: function () {
          $("#btn_save").click(function () {
            standard.dict.save();//保存
          });
          $("#btn_close").click(function () {//关闭
            win.closeDialog();
          });
        }
      };
    
      $(function(){
        standard.dict.init();
      })
  })(jQuery, window);
</script>

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

@@ -81,17 +81,14 @@
        dataType: "json",
        data:{condition: JSON.stringify({"type":type,"name":name})},
        success: function (data) {
          var resultArr = [];
          var array = data;
          for(var i=0;i<array.length;i++){
             resultArr.push(array[i]);
          }
          if (resultArr != null) {
          if(data.successFlg){
            var resultArr =  data.detailModelList || [];
            adapterplan.list.setUserList(resultArr);
          }else{
            $.ligerDialog.error(data.message);
          }
          else {
            $.ligerDialog.error("数据获取失败！");
          }
        }
      })
    },
@@ -149,23 +146,31 @@
    },
    addVersion: function (id,name,rowindex,type) {
      var _tital;
      var schemeNm = "";
      var schemeId = "";
      var versionId = "";
      var versionNm = "";
      var _url;
      adapterplan.list.grid.select(rowindex);//选中行
      if(type=="add"){
        _tital = "新增版本";
      }else if(type=="modify"){
        _tital = "修改版本";
        schemeId = id;
        schemeNm = name;
      }else{
        _tital = "版本信息";
      }
      var _url;
      adapterplan.list.grid.select(rowindex);//选中行
      if (type == '') {
        if(type=="modify"){
          _tital = "修改版本";
        }else{
          _tital = "版本信息";
        }
        versionId = id;
        versionNm = name;
        var row = adapterplan.list.grid.getParent(adapterplan.list.grid.getSelectedRow());
        if(row!=null) {//是父节点
          name = row.name;
          schemeNm = row.name;
          schemeId = row.id;
        }
      }
      _url = adapterplan.list._url + "/adapterPlan/versionUpdate?id="+ id+"&type="+type+"&name="+name+"&schemeId="+id;
      _url = adapterplan.list._url + "/adapterPlan/versionUpdate?versionId="+ versionId+"&type="+type+"&versionNm="+versionNm+"&schemeId="+schemeId+"&schemeNm="+schemeNm;
      var callback = function () {
        adapterplan.list.getTypeList();
      };
@@ -184,12 +189,14 @@
                  dataType: "json",
                  data:{versionId: Number(id), publisher:""},
                  success: function (data) {
                    if(Util.isStrEmpty(data.message)){
                      $.ligerDialog.success("发布成功!");
                    if(data.successFlg){
                      $.ligerDialog.success(data.message);
                      adapterplan.list.getTypeList();
                    }else{
                      $.ligerDialog.error("发布失败！")
                      $.ligerDialog.error(data.message);
                    }
                  },
                  error: function (jqXHR, textStatus, errorThrown) {
                    $.ligerDialog.error("发布失败！")
@@ -257,17 +264,16 @@
          $.ajax({
            url: adapterplan.list._url + "/adapterCenter/deleteScheme",
            type: "get",
            dataType: "text",
            dataType: "json",
            data: {schemeId: Number(schemeId)},
            success: function (data) {
              if(Util.isStrEmpty(data.message)){
                $.ligerDialog.success("删除成功!");
              if(data.successFlg){
                $.ligerDialog.success(data.message);
                adapterplan.list.getTypeList();
              }else if(data.message=="ehr.scheme.version.exist"){
                $.ligerDialog.error("当前选中适配方案下面包含有版本，不可直接删除该适配方案！");
              }else{
                $.ligerDialog.error("删除失败！");
                $.ligerDialog.error(data.message);
              }
            },
            error: function (jqXHR, textStatus, errorThrown) {
              $.ligerDialog.error("删除失败！");
@@ -283,14 +289,15 @@
          $.ajax({
            url: adapterplan.list._url + "/adapterCenter/deleteVersion",
            type: "get",
            dataType: "text",
            dataType: "json",
            data: {versionId: Number(versionId)},
            success: function (data) {
              if(Util.isStrEmpty(data.message)){
                $.ligerDialog.success("删除成功!");
              debugger
              if(data.successFlg){
                $.ligerDialog.success(data.message);
                adapterplan.list.getTypeList();
              }else{
                $.ligerDialog.error("删除失败！");
                $.ligerDialog.error(data.message);
              }
            },

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

@@ -11,19 +11,19 @@
  <div class="m-form-group">
    <label>适配方案名称：</label>
    <div class="l-text-wrapper m-form-control">
      <label type="text" class="f-w240 " id="txt_stdname" style="text-align: left"/>
      <label type="text" class="f-w240 f-pl5" id="txt_schemeNm" style="text-align: left"/>
    </div>
  </div>
  <div class="m-form-group">
    <label><span class="red">*&nbsp;</span>适配版本名称：</label>
    <div class="l-text-wrapper m-form-control">
      <input type="text" class="required f-w240 " id="txt_name" name="name">
      <input type="text" class="required f-w240 f-pl5" id="txt_versionNm" name="name">
    </div>
  </div>
  <div class="m-form-group" id="div_add_baseVersion">
    <label>基础版本名称：</label>
    <div class="m-form-control">
      <input type="text" class="f-w240 " id="sel_baseVersion" data-type="select" name="baseVersion" style="text-align: left"/>
      <input type="text" class="f-w240 f-pl5" id="sel_baseVersion" data-type="select" name="baseVersion" style="text-align: left"/>
    </div>
  </div>
@@ -35,7 +35,7 @@
      <span>确认</span>
    </div>
  </div>
  <input type="hidden" id="id" name="id"/>
  <input type="hidden" id="schemeId" name="schemeId"/>
  <input type="hidden" id="type" value=""/>
  <input type="hidden" id="hd_url" value="${contextRoot}"/>
</div>
@@ -44,13 +44,13 @@
  <div class="m-form-group">
    <label>适配方案名称：</label>
    <div class="l-text-wrapper m-form-control">
      <label type="text" class="f-w240 " id="lbl_seestdname"  style="text-align: left"/>
      <label type="text" class="f-w240 " id="lbl_schemeNm"  style="text-align: left"/>
    </div>
  </div>
  <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_versionNm" style="text-align: left"/>
    </div>
  </div>
  <div class="m-form-group">

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

@@ -22,31 +22,33 @@
          validator: null,
          baseversion_select: null,
          init: function () {
            var name = $.Util.getUrlQueryString('name');
            
            var type = $.Util.getUrlQueryString('type');
            var id = $.Util.getUrlQueryString('id');
            var schemeNm = $.Util.getUrlQueryString('schemeNm');
            var schemeId = Number($.Util.getUrlQueryString('schemeId').replace("scheme",""));
            var versionId = Number($.Util.getUrlQueryString('versionId').replace("version",""));
            var versionNm = $.Util.getUrlQueryString('versionNm');
            $("#type").val(type);
            $("#txt_stdname").text(name);
            $("#lbl_seestdname").text(name);
            $("#txt_schemeNm").text(schemeNm);//适配方案名称
            $("#lbl_schemeNm").text(schemeNm);//适配方案名称
            $("#sel_baseVersion").hide();
            //基础版本名称
            $("#sel_baseVersion").ligerComboBox({url : adapterplan.version._url+"/adapterCenter/getVersions?schemeId="+schemeId ,
              cancelable:false});
            if(type=="add"){//新增
               id = Number(id.replace("scheme",""));
               $("#id").val(id);
              this.$addform.show();
              //基础版本名称
              $("#sel_baseVersion").ligerComboBox({url : adapterplan.version._url+"/adapterversion/getVersions?schemeId="+id ,
                cancelable:false,
               });
                 $("#schemeId").val(schemeId);
                this.$addform.show();
            }else if(type=="modify"){//修改
              this.$addform.show();
              //基础版本名称
              this.$div_add_baseVersion.addClass("m-form-readonly");
              $("#sel_baseVersion").ligerComboBox({url : adapterplan.version._url+"/adapterversion/getVersions?schemeId=0" ,
                cancelable:false,
                });
              this.getAdapterVersionInfo(id,type);
                $("#txt_versionNm").val(versionNm);
                this.$addform.show();
                //基础版本名称
                this.$div_add_baseVersion.addClass("m-form-readonly");
                this.getAdapterVersionInfo(versionId,type);
            }else{//查看
              this.$seeform.show();
              this.getAdapterVersionInfo(id,type);
                $("#txt_versionNm").text(versionNm);
                this.$seeform.show();
                this.getAdapterVersionInfo(versionId,type);
            }
            this.event();
@@ -57,8 +59,6 @@
            });
          },
          getAdapterVersionInfo: function (versionId,type) {//获取基础版本信息
               var Data;
               versionId = Number(versionId.replace("version",""));
               var u = adapterplan.version;
              $("#versionId").val(versionId+"");
              $.ajax({
@@ -67,26 +67,27 @@
                dataType: "json",
                data: {versionId: versionId},
                success: function (data) {
                  if(data!=null){
                  if(data.successFlg){
                    
                    u._getData = data;
                    if (type != '') {//新增或修改
                      Data={
                        name: u._getData.name,
                        baseVersion:u._getData.baseVersion==null?"":u._getData.baseVersion
                      };
                        u.$addform.attrScan();
                        u.$addform.Fields.fillValues({
                          baseVersion:u._getData.baseVersion==null?"":u._getData.baseVersion
                        });
                    } else {//查看版本信息
                      $("#lbl_seename").text(u._getData.name);
                    }
                    if($.Util.isStrEmpty(u._getData.baseVersion)){
                      $("#lbl_primaryVersion").text("无");
                    }else{
                      $("#lbl_primaryVersion").text(u._getData.baseVersion);
                      $("#lbl_versionNm").text(u._getData.name);
                      if($.Util.isStrEmpty(u._getData.baseVersion)){
                        $("#lbl_primaryVersion").text("无");
                      }else{
                        
                        liger.get('sel_baseVersion').selectValue(u._getData.baseVersion)
                        $("#lbl_primaryVersion").text(liger.get('sel_baseVersion').getText());
                      }
                    }
                  }else{
                    $.ligerDialog.error(result.errorMsg);
                    $.ligerDialog.error(data.message);
                  }
                },
@@ -99,6 +100,7 @@
        if(!this.validator.validate()){
          return;
        }
        $("#btn_save").html("确认中...").css("pointer-events","none");
        var _url = "";
        var resultData;
        adapterplan.version.$addform.attrScan();
@@ -107,7 +109,7 @@
          var ob = {};
          ob.name = jsonString.name;
          ob.baseVersion = jsonString.baseVersion;
          ob.schemeId = Number($("#id").val());
          ob.schemeId = Number($("#schemeId").val());
          resultData = ob;
          _url = adapterplan.version._url+"/adapterCenter/addVersion";
        }else if( $("#type").val()=="modify"){//修改保存
@@ -122,19 +124,19 @@
          dataType: "json",
          data:{version:  JSON.stringify(resultData)},
          success: function (data) {
            if(Util.isStrEmpty(data.message)){
              $.ligerDialog.alert("保存成功", "提示", "success", function () {
            $("#btn_save").html("确认").css("pointer-events","");
            if(data.successFlg){
              $.ligerDialog.alert(data.message, "提示", "success", function () {
                parent.adapterplan.list.getTypeList();//刷新数据
                parent.adapterplan.list.top.dialog_adapter_detail.close();
              }, null);
            }else  if(data.message=="ehr.scheme.version.name.exist"){
              $.ligerDialog.error("适配版本名称已存在！");
            }else{
              $.ligerDialog.error(data.message);
            }
          },
          error: function (jqXHR, textStatus, errorThrown) {
            $("#btn_save").html("确认").css("pointer-events","");
            $.ligerDialog.error("保存失败！")
          }
        })

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

@@ -84,12 +84,12 @@
        dataType: "json",
        data:{condition: JSON.stringify({"type":type,"name":name})},
        success: function (data) {
          var resultArr = [];
          var array = data;
          for(var i=0;i<array.length;i++){
            resultArr.push(array[i]);
          if(data.successFlg){
            var resultArr =  data.detailModelList || [];
            standard.list.setUserList(resultArr);
          }else{
            $.ligerDialog.error(data.message);
          }
          standard.list.setUserList(resultArr);
        },error:function(){
          $.ligerDialog.error("数据获取失败！");
        }
@@ -206,11 +206,11 @@
            dataType: "json",
            data: {versionId: versionId,publisher:""},
            success: function (data) {
              if(Util.isStrEmpty(data.message)){
                $.ligerDialog.success("发布成功!");
              if(data.successFlg){
                $.ligerDialog.success(data.message);
                standard.list.getTypeList();
              }else{
                $.ligerDialog.error("发布失败！");
                $.ligerDialog.error(data.message);
              }
            },
@@ -261,16 +261,14 @@
          $.ajax({
              url: standard.list._url + "/standardCenter/deleteStandard",
              type: "get",
              dataType: "text",
              dataType: "json",
              data: {standardId: standardId},
              success: function (data) {
                if(Util.isStrEmpty(data.message)){
                  $.ligerDialog.success("删除成功!");
                if(data.successFlg){
                  $.ligerDialog.success(data.message);
                  standard.list.getTypeList();
                }else if(data.message=="ehr.standard.version.exist"){
                  $.ligerDialog.error("当前选中标准下面包含有标准版本,不可直接删除该标准！");
                }else{
                  $.ligerDialog.error("删除失败！");
                  $.ligerDialog.error(data.message);
                }
              },
            error: function (jqXHR, textStatus, errorThrown) {
@@ -287,16 +285,14 @@
          $.ajax({
            url: standard.list._url + "/standardCenter/deletePublisher",
            type: "get",
            dataType: "text",
            dataType: "json",
            data: {publisherId: publisherId},
            success: function (data) {
              if(Util.isStrEmpty(data.message)){
                $.ligerDialog.success("删除成功!");
              if(data.successFlg){
                $.ligerDialog.success(data.message);
                standard.list.getTypeList();
              }else if(data.message=="ehr.org.exist.standard"){
                $.ligerDialog.error("当前选中发布机构下面包含有标准,不可直接删除该机构！");
              }else{
                $.ligerDialog.error("删除失败！");
                $.ligerDialog.error(data.message);
              }
            },
            error: function (jqXHR, textStatus, errorThrown) {
@@ -312,17 +308,16 @@
          $.ajax({
            url: standard.list._url + "/standardCenter/deleteVersion",
            type: "get",
            dataType: "text",
            dataType: "json",
            data: {versionId: versionId,version:version},
            success: function (data) {
              if(Util.isStrEmpty(data.message)){
                $.ligerDialog.success("删除成功!");
              if(data.successFlg){
                $.ligerDialog.success(data.message);
                standard.list.getTypeList();
              } else if(data.message=="ehr.standard.version.used.delete.failed"){
                $.ligerDialog.error("标准版本已在适配方案中使用！");
              }else{
                $.ligerDialog.error("删除失败！");
                $.ligerDialog.error(data.message);
              }
            },
            error: function (jqXHR, textStatus, errorThrown) {
              $.ligerDialog.error("删除失败!");

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

@@ -273,18 +273,28 @@
            }
            ids = ids.length>0?ids.substring(1, ids.length):ids;
          }
          var toData = null;
          if(cfgModel==0){//数据集
            toData={datasetId:ids, stdVersion:$("#version").val()};
          }else if(cfgModel==1){//字典
            toData={dictId:ids, stdVersion:$("#version").val()};
          }
          $.ligerDialog.confirm('确认删除所选数据？', function (r) {
            if(r){
              $.ajax({
                url: '${contextRoot}'+cfg[cfgModel].left.delLs,
                type: "get",
                dataType: "text",
                data:{id:ids, stdVersion:$("#version").val()},
                dataType: "json",
                data:toData,
                success: function (data) {
                  if(data){
                    $.ligerDialog.success( '操作成功！');
                  if(data.successFlg){
                    $.ligerDialog.success(data.message);
                    master.reloadGrid();
                  }else{
                    $.ligerDialog.error(data.message);
                  }
                },
                error: function (jqXHR, textStatus, errorThrown) {
                  $.ligerDialog.error("删除数据集信息失败！")
@@ -429,18 +439,26 @@
            }
            ids = ids.length>0?ids.substring(1, ids.length):ids;
          }
          var toData = null;
          if(cfgModel==0){//数据元
            toData={metadataId:ids, stdVersion:$("#version").val()};
          }else if(cfgModel==1){//字典项
            toData={dictEntryId:ids, stdVersion:$("#version").val()};
          }
          $.ligerDialog.confirm('确认删除所选数据？', function (r) {
            if(r){
              $.ajax({
                url: '${contextRoot}'+cfg[cfgModel].right.delLs,
                type: "get",
                dataType: "text",
                data:{id:ids, stdVersion:$("#version").val()},
                dataType: "json",
                data:toData,
                success: function (data) {
                  if(data){
                    $.ligerDialog.success( '操作成功！');
                  if(data.successFlg){
                    $.ligerDialog.success( data.message);
                    entryMaster.reloadGrid();
                  }else{
                    $.ligerDialog.error(data.message);
                  }
                },
                error: function (jqXHR, textStatus, errorThrown) {
@@ -537,8 +555,11 @@
            dataType: "json",
            data:{activityFlag:'1'},
            success: function (data) {
              if(!Util.isStrEmpty(data.detailModelList)){
              debugger
              if(data.successFlg && !Util.isStrEmpty(data.detailModelList)){
                orgList = data.detailModelList;
              }else{
                $.ligerDialog.error(data.message);
              }
            },
            error: function (jqXHR, textStatus, errorThrown) {
@@ -551,9 +572,13 @@
            type: "get",
            dataType: "json",
            success: function (data) {
              if(!Util.isStrEmpty(data.detailModelList)){
              if(data.successFlg && !Util.isStrEmpty(data.detailModelList)){
                datasourceList = data.detailModelList;
              }else{
                $.ligerDialog.error(data.message);
              }
            },
            error: function (jqXHR, textStatus, errorThrown) {
              $.ligerDialog.error("获取数据源信息列表失败！")
@@ -605,7 +630,7 @@
              dataResult.push(ob);
            }
            debugger
            
            $.ajax({ //ajax处理
              type: "POST",

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

@@ -18,37 +18,37 @@
  <div class="m-form-group">
    <label>数据集编码：</label>
    <div class="l-text-wrapper m-form-control essential">
      <input type="text" class="required f-w240 " id="txt_code" data-attr-scan="code">
      <input type="text" class="required f-w240 f-pl5" id="txt_code" data-attr-scan="code">
    </div>
  </div>
  <div class="m-form-group">
    <label>数据源名称：</label>
    <div class="l-text-wrapper m-form-control essential">
      <input type="text" class="required f-w240 " id="txt_name" data-attr-scan="name">
      <input type="text" class="required f-w240 f-pl5" id="txt_name" data-attr-scan="name">
    </div>
  </div>
  <div class="m-form-group">
    <label>语言：</label>
    <div class="l-text-wrapper m-form-control">
      <input type="text" class="f-w240 " id="txt_language" data-attr-scan="language">
      <input type="text" class="f-w240 f-pl5" id="txt_language" data-attr-scan="language">
    </div>
  </div>
  <div class="m-form-group" style="display: none;">
    <label>类别/业务领域：</label>
    <div class="l-text-wrapper m-form-control">
      <input type="text" class="f-w240 " id="txt_catalog" ><!--data-attr-scan="catalog"-->
      <input type="text" class="f-w240 f-pl5" id="txt_catalog" ><!--data-attr-scan="catalog"-->
    </div>
  </div>
  <div class="m-form-group">
    <label>分类模式：</label>
    <div class="l-text-wrapper m-form-control">
      <input type="text" class="f-w240 " id="txt_classModel" data-attr-scan="classModel">
      <input type="text" class="f-w240 f-pl5" id="txt_classModel" data-attr-scan="classModel">
    </div>
  </div>
  <div class="m-form-group">
    <label>摘要：</label>
    <div class="m-form-control">
      <textarea rows="3" id="txt_summary" style="width: 240px;height: 60px;" data-attr-scan="summary"  class="useTitle"></textarea>
      <textarea rows="3" id="txt_summary" style="width: 240px;height: 60px;" data-attr-scan="summary"  class="useTitle f-pl5"></textarea>
    </div>
  </div>
  <div class="m-form-bottom">

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

@@ -29,7 +29,7 @@
              dataType: "json",
              data: {datasetId: id,stdVersion:version},
              success: function (data) {
                if(data!=null){
                if(data.successFlg){
                  if(type=="modify" ){
                    u.$type_form.attrScan();
                    u.$type_form.Fields.fillValues({
@@ -48,9 +48,8 @@
                    $("#see_catalog").text(data.catalog);
                    $("#see_classModel").text(data.classModel);
                  }
                }else{
                  $.ligerDialog.error(result.errorMsg);
                  $.ligerDialog.error(data.message);
                }
              },
@@ -84,22 +83,20 @@
          }else{//新增
            _url = $("#hd_url").val() + "/standardCenter/addDataset";
          }
          
          $.ajax({
            url: _url,
            dataType: "json",
            data:{dataset: JSON.stringify(dataJson[0]),stdVersion:$("#std_version").val(),standardId:$("#standard_id").val()},
            success: function (data) {
              if(Util.isStrEmpty(data.message)){
                $.ligerDialog.alert("保存成功", "提示", "success", function () {
              debugger
              if(data.successFlg){
                $.ligerDialog.alert(data.message, "提示", "success", function () {
                  parent.master.reloadGrid();
                  parent.master.entryInfoDialog.close();
                }, null);
              }else{
                if(data.message=="ehr.standard.dataset.code.exist"){
                  $.ligerDialog.error("数据集编码已存在！");
                }else{
                  $.ligerDialog.error("保存失败！")
                }
                $.ligerDialog.error(data.message);
              }
            },

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

@@ -18,7 +18,7 @@
          <label>数据元名称:</label>
        </td>
        <td class="btn-isnull td-left">
          <input id="inp_name" class="required useTitle ajax max-length-128 validate-special-char" style="width: 240px;" required-title=
          <input id="inp_name" class="required useTitle ajax max-length-128 validate-special-char f-pl5" style="width: 240px;" required-title=
          <spring:message code="lbl.must.input"/>
                  data-attr-scan="name"/>
        </td>
@@ -26,7 +26,7 @@
          <label>数据类型:</label>
        </td>
        <td class="td-left">
          <input id="inp_type" class="max-length-255 validate-special-char" style="width: 240px;" data-attr-scan="type"/>
          <input id="inp_type" class="max-length-255 validate-special-char f-pl5" style="width: 240px;" data-attr-scan="type"/>
        </td>
      </tr>
      <tr>
@@ -34,7 +34,7 @@
          <label>数据元编码:</label>
        </td>
        <td class="btn-isnull td-left">
          <input id="inp_code" class="required useTitle max-length-128 validate-special-char" style="width: 240px;" required-title=
          <input id="inp_code" class="required useTitle max-length-128 validate-special-char f-pl5" style="width: 240px;" required-title=
          <spring:message code="lbl.must.input"/> data-attr-scan="code"/>
        </td>
@@ -42,7 +42,7 @@
          <label>数据格式:</label>
        </td>
        <td class="td-left">
          <input id="inp_format" class="max-length-10 validate-special-char" style="width: 240px;" data-attr-scan="format"/>
          <input id="inp_format" class="max-length-10 validate-special-char f-pl5" style="width: 240px;" data-attr-scan="format"/>
        </td>
      </tr>
      <tr>
@@ -50,13 +50,13 @@
          <label>内部编码:</label>
        </td>
        <td class="btn-isnull td-left">
          <input type="text" id="inp_deCode" class="required validate-special-char" style="width: 240px;" data-attr-scan="deCode"/>
          <input type="text" id="inp_deCode" class="required validate-special-char f-pl5" style="width: 240px;" data-attr-scan="deCode"/>
        </td>
        <td>
          <label>对应字典:</label>
        </td>
        <td class="td-left">
          <input id="sel_dict" type="hidden" class="max-length-50 validate-special-char" style="width: 240px;" data-attr-scan="dictId" data-type="select"/>
          <input id="sel_dict" type="hidden" class="max-length-50 validate-special-char f-pl5" style="width: 240px;" data-attr-scan="dictId" data-type="select"/>
        </td>
      </tr>
      <tr>
@@ -64,7 +64,7 @@
          <label>定义:</label>
        </td>
        <td colspan="3" class="td-left">
                        <textarea id="tea_definition" class="metaDataExplain max-length-255 validate-special-char" style=" width: 583px;"
                        <textarea id="tea_definition" class="metaDataExplain max-length-255 validate-special-char f-pl5" style=" width: 595px;  max-width: 595px; max-height: 120px; height: 120px;"
                                  data-attr-scan="definition"></textarea>
        </td>
      </tr>
@@ -73,13 +73,13 @@
          <label>字段名:</label>
        </td>
        <td class="btn-isnull td-left">
          <input id="inp_columnName" class="required max-length-64 validate-special-char" data-attr-scan="columnName" style="width: 240px;"/>
          <input id="inp_columnName" class="required max-length-64 validate-special-char f-pl5" data-attr-scan="columnName" style="width: 240px;"/>
        </td>
        <td>
          <label>字段长度:</label>
        </td>
        <td class="td-left">
          <input id="inp_columnLength" class="max-length-15 validate-positive-integer useTitle" data-attr-scan="columnLength" style="width: 240px;"  validate-positive-integer-title="请输入正整数" />
          <input id="inp_columnLength" class="max-length-15 validate-positive-integer useTitle f-pl5" data-attr-scan="columnLength" style="width: 240px;"  validate-positive-integer-title="请输入正整数" />
        </td>
      </tr>
      <tr>
@@ -186,7 +186,7 @@
            <label>定义:</label>
          </td>
          <td colspan="3" class="td-left">
            <textarea id="see_definition"  class="metaDataExplain" style=" width: 583px;border: 0;padding-left:30px;"></textarea>
            <textarea id="see_definition"  class="metaDataExplain" readonly="readonly" style="width: 595px; border: 0px;outline: none;resize: none; padding-left: 30px; max-width: 595px; max-height: 120px; margin: 0px; height: 120px;"></textarea>
          </td>
        </tr>
        <tr style="border-top: 1px solid #ccc;">

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

@@ -43,7 +43,8 @@
                dataType: "json",
                data: {datasetId: datasetId,stdVersion:version,metadataId:metadataId},
                success: function (data) {
                  if(data!=null){
                  if(data.successFlg){
                    debugger
                    if(type=="modify"){//修改数据元信息
                      u.$type_form.attrScan();
                      u.$type_form.Fields.fillValues({
@@ -95,9 +96,8 @@
                      }
                    }
                  }else{
                    $.ligerDialog.error(result.errorMsg);
                    $.ligerDialog.error(data.message);
                  }
                },
@@ -140,18 +140,15 @@
              dataType: "json",
              data:{metadata: JSON.stringify(dataJson[0]),stdVersion:$("#std_version").val()},
              success: function (data) {
                if(Util.isStrEmpty(data.message)){
                  $.ligerDialog.alert("保存成功", "提示", "success", function () {
                if(data.successFlg){
                  $.ligerDialog.alert(data.message, "提示", "success", function () {
                    parent.entryMaster.reloadGrid();
                    parent.entryMaster.entryInfoDialog.close();
                  }, null);
                }else if(data.message=="ehr.standard.metaData.code.exist"){
                  $.ligerDialog.error("数据元编码已存在！");
                }else {
                }else{
                  $.ligerDialog.error(data.message);
                }
              },
              error: function (jqXHR, textStatus, errorThrown) {
                $.ligerDialog.error("保存失败！")

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

@@ -37,7 +37,7 @@
            dataType: "json",
            data: {dictId: dictId,stdVersion:version,dictEntryId:dictEntryId},
            success: function (data) {
              if(data!=null){
              if(data.successFlg){
                if(type=="modify"){
                  u.$type_form.attrScan();
                  u.$type_form.Fields.fillValues({
@@ -50,9 +50,8 @@
                  $("#see_value").text(data.value);
                  $("#see_description").text(data.description==null?"":data.description);
                }
              }else{
                $.ligerDialog.error(result.errorMsg);
                $.ligerDialog.error(data.message);
              }
            },
@@ -92,18 +91,14 @@
          dataType: "json",
          data:{dictEntry: JSON.stringify(dataJson[0]),stdVersion:$("#std_version").val()},
          success: function (data) {
            debugger
            if(Util.isStrEmpty(data.message)){
              $.ligerDialog.alert("保存成功", "提示", "success", function () {
            
            if(data.successFlg){
              $.ligerDialog.alert(data.message, "提示", "success", function () {
                parent.entryMaster.reloadGrid();
                parent.entryMaster.entryInfoDialog.close();
              }, null);
            }else{
              if(data.message=="ehr.standard.dict.entry.code.exist"){
                $.ligerDialog.error("值域编码已存在！");
              }else{
                $.ligerDialog.error(data.message);
              }
              $.ligerDialog.error(data.message);
            }
          },

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

@@ -32,8 +32,8 @@
            dataType: "json",
            data: {dictId: id,stdVersion:version},
            success: function (data) {
              debugger
              if(data!=null){
              
              if(data.successFlg){
                if(type=="modify" ){
                  u.$type_form.attrScan();
                  u.$type_form.Fields.fillValues({
@@ -54,9 +54,8 @@
                  $("#see_parentId").text($("#sel_parentId").ligerComboBox().getText());
                  $("#see_description").text(data.description==null?"":data.description);
                }
              }else{
                $.ligerDialog.error(result.errorMsg);
                $.ligerDialog.error(data.message);
              }
            },
@@ -94,17 +93,13 @@
          dataType: "json",
          data:{dict: JSON.stringify(dataJson[0]),stdVersion:$("#std_version").val()},
          success: function (data) {
            if(Util.isStrEmpty(data.message)){
              $.ligerDialog.alert("保存成功", "提示", "success", function () {
            if(data.successFlg){
              $.ligerDialog.alert(data.message, "提示", "success", function () {
                parent.master.reloadGrid();
                parent.master.entryInfoDialog.close();
              }, null);
            }else{
              if(data.message=="ehr.standard.dict.code.exist"){
                $.ligerDialog.error("字典编码已存在！");
              }else{
                $.ligerDialog.error(data.message);
              }
              $.ligerDialog.error(data.message);
            }
          },

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

@@ -30,11 +30,6 @@
                       class="f-ml10">
                <input id="hiddenText" type="text" style="display:none">
            </div>
            <div class="m-form-control right">
                <div id="btn_add_std" class="l-button l-button-green" >
                    <span>新增标准</span>
                </div>
            </div>
        </div>
    </form>
    <!--######集成标准信息表######-->

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

@@ -43,7 +43,10 @@
        {
          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=="1"){//行数据为标准数据
          if(rowdata.type=="0"){//行数据为机构数据
              html += '<a href="#" style=\"width: 80px;\"id="btn_add_std" 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>';
              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>';
@@ -81,20 +84,14 @@
        dataType: "json",
        data:{condition: JSON.stringify({"type":type,"name":name})},
        success: function (data) {
          debugger
          var resultArr = [];
          var array = data;
          for(var i=0;i<array.length;i++){
            if(array[i]!=null){
              resultArr.push(array[i]);
            }
          }
          if (resultArr.length>0) {//集成标准数据只有一条
            $("#btn_add_std").css("background","#e1e1e1");
            $("#btn_add_std").css("pointer-events","none");
            $("#btn_add_std").find("span").css("color","#a8a8a8");
          if(data.successFlg){
            var resultArr =  data.detailModelList || [];
            standard.list.setUserList(resultArr);
          }else{
            $.ligerDialog.error(data.message);
          }
          standard.list.setUserList(resultArr);
        },error:function(){
          $.ligerDialog.error("数据获取失败！");
        }
@@ -132,8 +129,10 @@
          },
          onError: function (a, b) {
          },
          onGroupExtend: function () {
          onAfterShowData: function (data) {
             if($("#div_cda_type_gridgrid").find(".l-grid-body-table tr").eq(1).length>0){//机构下已有标准数据，则”新增标准“按钮隐藏
                  $("#btn_add_std").hide();
             }
          }
        });
@@ -199,11 +198,11 @@
            dataType: "json",
            data: {versionId: versionId,publisher:""},
            success: function (data) {
              if(Util.isStrEmpty(data.message)){
                $.ligerDialog.success("发布成功!");
              if(data.successFlg){
                $.ligerDialog.success(data.message);
                standard.list.getTypeList();
              }else{
                $.ligerDialog.error("发布失败！");
                $.ligerDialog.error(data.message);
              }
            },
@@ -225,18 +224,17 @@
      indexPage.openChildPage("",'${contextRoot}/integration/configuration?version='+code+"&stdId="+pid+"&type="+$("#type").val()+"&status="+status+"&name="+name);
    },
    deleted: function (id,name,rowindex) {
      standard.list.grid.select(rowindex);//选中行
      var selectedRow = standard.list.grid.getSelectedRow();
      var _text;
      var row = standard.list.grid.getParent(standard.list.grid.getSelectedRow());
      if(row==null){//是父节点（删除标准）
      if(selectedRow.__hasChildren){//是父节点（删除标准）
           id = Number(id.replace("standard",""));
          _text = "确定删除标准<br/>"+name+"？";
          standard.list.doDeletedStandard(id, _text);
      }else{//是子节点（删除标准版本）// var parentName = $.parseJSON(JSON.stringify(row)).name;//获取父节点的标准名称
          id = Number(id.replace("version",""));
          _text = "确定删除版本<br/>"+name+"？";
          var version = standard.list.grid.getSelectedRow().code;
          var version = selectedRow.code;
          standard.list.doDeletedVersion(id,version, _text);
      }
    },
@@ -246,16 +244,15 @@
          $.ajax({
              url: standard.list._url + "/standardCenter/deleteStandard",
              type: "get",
              dataType: "text",
              dataType: "json",
              data: {standardId: standardId},
              success: function (data) {
                if(Util.isStrEmpty(data.message)){
                  $.ligerDialog.success("删除成功!");
                
                if(data.successFlg){
                  $.ligerDialog.success(data.message);
                  standard.list.getTypeList();
                }else  if(data.message=="ehr.standard.version.exist"){
                  $.ligerDialog.error("当前选中标准下面包含有标准版本,不可直接删除该标准！");
                }else{
                  $.ligerDialog.error("删除失败！");
                  $.ligerDialog.error(data.message);
                }
              },
            error: function (jqXHR, textStatus, errorThrown) {
@@ -266,23 +263,21 @@
      });
    },
    doDeletedVersion: function (versionId, version,_text) {//删除标准版本
      
      $.ligerDialog.confirm(_text, function (confirm) {
        if (confirm) {
          $.ajax({
            url: standard.list._url + "/standardCenter/deleteVersion",
            type: "get",
            dataType: "text",
            dataType: "json",
            data: {versionId: versionId,version:version},
            success: function (data) {
              if(Util.isStrEmpty(data.message)){
                $.ligerDialog.success("删除成功!");
              if(data.successFlg){
                $.ligerDialog.success(data.message);
                standard.list.getTypeList();
              } else if(data.message=="ehr.standard.version.used.delete.failed"){
                $.ligerDialog.error("标准版本已在适配方案中使用！");
              }else{
                $.ligerDialog.error("删除失败！");
                $.ligerDialog.error(data.message);
              }
            },
            error: function (jqXHR, textStatus, errorThrown) {
              $.ligerDialog.error("删除失败!");
@@ -292,9 +287,6 @@
      });
    },
    event: function () {
      $('#btn_add_std').click(function () {
        standard.list.add("","","","");
      });
      $("#inp_search").keyup(function (e) {
        if (e.keyCode == 13) {

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

@@ -12,43 +12,43 @@
  <div class="m-form-group">
    <label>发布机构：</label>
    <div class="l-text-wrapper m-form-control">
      <label type="text" class="f-w240 " id="lbl_publisher" data-align="left" style="text-align: left"></label>
      <label type="text" class="f-w240" id="lbl_publisher" data-align="left" style="text-align: left"></label>
    </div>
  </div>
  <div class="m-form-group">
    <label>发布机构代码：</label>
    <div class="l-text-wrapper m-form-control">
      <label type="text" class="f-w240" id="lbl_publisherOrgCode" style="text-align: left"></label>
      <label type="text" class="f-w240 f-pl5" id="lbl_publisherOrgCode" style="text-align: left"></label>
    </div>
  </div>
  <div class="m-form-group">
    <label>标准名称：</label>
    <div class="l-text-wrapper m-form-control essential">
      <input type="text" class="required f-w240 " id="txt_name" data-attr-scan="name">
      <input type="text" class="required f-w240 f-pl5" id="txt_name" data-attr-scan="name">
    </div>
  </div>
  <div class="m-form-group" id="div_code">
    <label>标准编码：</label>
    <div class="l-text-wrapper m-form-control essential">
      <input type="text" class="required f-w240 " id="txt_code" data-attr-scan="code">
      <input type="text" class="required f-w240 f-pl5" id="txt_code" data-attr-scan="code">
    </div>
  </div>
  <div class="m-form-group">
    <label>参考标准：</label>
    <div class="l-text-wrapper m-form-control">
      <input type="text" class="f-w240 " id="txt_refStandard" data-attr-scan="refStandard">
      <input type="text" class="f-w240 f-pl5" id="txt_refStandard" data-attr-scan="refStandard">
    </div>
  </div>
  <div class="m-form-group">
    <label>参考标准版本：</label>
    <div class="l-text-wrapper m-form-control">
      <input type="text" class="f-w240 " id="txt_refStandardVersion" data-attr-scan="refStandardVersion">
      <input type="text" class="f-w240 f-pl5" id="txt_refStandardVersion" data-attr-scan="refStandardVersion">
    </div>
  </div>
  <div class="m-form-group">
    <label>标准说明：</label>
    <div class="m-form-control">
      <textarea rows="3" id="txt_summary" name="txb_desc" style="width: 240px;height: 60px;" data-attr-scan="summary"  class="useTitle"></textarea>
      <textarea rows="3" id="txt_summary" name="txb_desc" style="width: 240px;height: 60px;" data-attr-scan="summary"  class="f-pl5 useTitle"></textarea>
    </div>
  </div>
  <div class="m-form-bottom">

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

@@ -38,20 +38,20 @@
                  dataType: "json",
                  data: {standardId: standardId},
                  success: function (data) {
                    if(data!=null){
                        $("#lbl_publisher").text(data.publisher);
                        $("#lbl_publisherOrgCode").text(data.publisherOrgCode);
                      u.$form.attrScan();
                      u.$form.Fields.fillValues({
                        code: data.code,
                        name: data.name,
                        refStandard: data.refStandard,
                        refStandardVersion: data.refStandardVersion,
                        summary: data.summary
                      });
                    }else{
                      $.ligerDialog.error(result.errorMsg);
                    }
                      if(data.successFlg){
                          $("#lbl_publisher").text(data.publisher);
                          $("#lbl_publisherOrgCode").text(data.publisherOrgCode);
                          u.$form.attrScan();
                          u.$form.Fields.fillValues({
                              code: data.code,
                              name: data.name,
                              refStandard: data.refStandard,
                              refStandardVersion: data.refStandardVersion,
                              summary: data.summary
                          });
                      }else{
                          $.ligerDialog.error(result.message);
                      }
                  },
                error: function (jqXHR, textStatus, errorThrown) {
@@ -77,9 +77,11 @@
                  type: "get",
                  dataType: "json",
                  success: function (data) {
                      if(data!=null){
                      if(data.successFlg){
                          $("#lbl_publisher").text(data.name);
                          $("#lbl_publisherOrgCode").text(data.code);
                      }else{
                          $.ligerDialog.error(data.message);
                      }
                  },
                  error: function (jqXHR, textStatus, errorThrown) {
@@ -122,19 +124,13 @@
              dataType: "json",
              data:{standard: JSON.stringify(dataJson[0])},
              success: function (data) {
                  if(Util.isStrEmpty(data.message)){
                      $.ligerDialog.alert("保存成功", "提示", "success", function () {
                  if(data.successFlg){
                      $.ligerDialog.alert(data.message, "提示", "success", function () {
                          parent.standard.list.getTypeList();//刷新数据
                          parent.standard.list.top.dialog_standard_detail.close();
                      }, null);
                  }else{
                      if(data.message=="ehr.standard.code.exist"){
                          $.ligerDialog.error("标准编码已存在！");
                      }else if (data.message=="ehr.standard.name.exist"){
                          $.ligerDialog.error("标准名称已存在！");
                      }else{
                          $.ligerDialog.error("保存失败！")
                      }
                      $.ligerDialog.error(data.message);
                  }
              },
              error: function (jqXHR, textStatus, errorThrown) {

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

@@ -17,31 +17,31 @@
  <div class="m-form-group">
    <label>标准编码：</label>
    <div class="l-text-wrapper m-form-control">
      <label type="text" class="f-w240 lbl-version" style="text-align: left" id="txt_stdcode"/>
      <label type="text" class="f-w240 lbl-version f-pl5" style="text-align: left" id="txt_stdcode"/>
    </div>
  </div>
  <div class="m-form-group">
    <label>标准版本名称：</label>
    <div class="l-text-wrapper m-form-control essential">
      <input type="text" class="required f-w240 " id="txt_name" data-attr-scan="name">
      <input type="text" class="required f-w240 f-pl5" id="txt_name" data-attr-scan="name">
    </div>
  </div>
  <div class="m-form-group" id="div_abaseVersion">
    <label>基础版本名称：</label>
    <div class="m-form-control">
      <input type="text" id="baseVersion" data-attr-scan="baseVersion">
      <input type="text" id="baseVersion" data-attr-scan="baseVersion" class="f-pl5">
    </div>
  </div>
  <div class="m-form-group" style="display: none;" id="div_baseVersion">
    <label>基础版本名称：</label>
    <div class="m-form-control">
      <label type="text" class="f-w240 " id="lbl_baseVersion" style="text-align: left"/>
      <label type="text" class="f-w240 f-pl5" id="lbl_baseVersion" style="text-align: left"/>
    </div>
  </div>
  <div class="m-form-group" style="display: none;" id="div_publisher">
    <label>发布状态：</label>
    <div class="m-form-control">
      <label type="text" class="f-w240 lbl_publishStatus"  style="text-align: left"/>
      <label type="text" class="f-w240 f-pl5 lbl_publishStatus"  style="text-align: left"/>
    </div>
  </div>
@@ -65,7 +65,7 @@
    </div>
  </div>
  <div class="m-form-group">
    <label>标准编码：</label>
    <label>标准版本编码：</label>
    <div class="l-text-wrapper m-form-control">
      <label type="text" class="f-w240 " id="lbl_version" style="text-align: left"></label>
    </div>

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

@@ -67,54 +67,52 @@
                dataType: "json",
                data: {versionId: versionId},
                success: function (data) {
                      if(data!=null){
                    if(data.successFlg){
                        u._getData = data;
                          debugger
                          if(type == ""){//查看标准版本信息
                              $("#lbl_version").text(u._getData.version);
                              $("#lbl_primaryVersion").text(u._getData.primaryVersion);
                              $("#lbl_publishUser").text(u._getData.publishUser);
                              $("#lbl_seename").text(u._getData.name);
                              if($.Util.isStrEmpty(u._getData.publishTime)){
                                  $("#lbl_publishTime").text("");
                              }else{
                                  $("#lbl_publishTime").text(u.getDate(u._getData.publishTime));
                              }
                        if(type == ""){//查看标准版本信息
                            $("#lbl_version").text(u._getData.version);
                            $("#lbl_primaryVersion").text(u._getData.primaryVersion);
                            $("#lbl_publishUser").text(u._getData.publishUser);
                            $("#lbl_seename").text(u._getData.name);
                            if($.Util.isStrEmpty(u._getData.publishTime)){
                                $("#lbl_publishTime").text("");
                            }else{
                                $("#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{
                                  $(".lbl_publishStatus").text("已发布");
                              }
                            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{
                                $(".lbl_publishStatus").text("已发布");
                            }
                          }else if(type =="1"){//修改
                              u.$addform.attrScan();
                              u.$addform.Fields.fillValues({
                                  name: u._getData.name,
                              });
                        }else if(type =="1"){//修改
                            u.$addform.attrScan();
                            u.$addform.Fields.fillValues({
                                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{
                                  $(".lbl_publishStatus").text("已发布");
                              }
                          }
                      }else{
                        $.ligerDialog.error(result.errorMsg);
                      }
                            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{
                                $(".lbl_publishStatus").text("已发布");
                            }
                        }
                    }else{
                        $.ligerDialog.error(result.message);
                    }
                },
                  error: function (jqXHR, textStatus, errorThrown) {
@@ -126,12 +124,13 @@
          if(!this.validator.validate()){
            return;
          }
            $("#btn_save").html("确认中...").css("pointer-events","none");
            var _url = "";
            var resultData;
            standard.version.$addform.attrScan();
            var jsonString = $.parseJSON(standard.version.$addform.Fields.toJsonString());
              if( $("#type").val()=="0"){//新增保存
                  debugger;
                  
                  var ob = {};
                  ob.name = jsonString.name;
                  ob.baseVersion = $("#baseVersion").ligerComboBox().getValue();
@@ -156,21 +155,18 @@
                dataType: "json",
                data:{version:  JSON.stringify(resultData)},
                success: function (data) {
                    if(Util.isStrEmpty(data.message)){
                        $.ligerDialog.alert("保存成功", "提示", "success", function () {
                    $("#btn_save").html("确认").css("pointer-events","");
                    if(data.successFlg){
                        $.ligerDialog.alert(data.message, "提示", "success", function () {
                            parent.standard.list.getTypeList();//刷新数据
                            parent.standard.list.top.dialog_standard_detail.close();
                        }, null);
                    }else{
                        if(data.message=="ehr.standard.version.name.exist"){
                            $.ligerDialog.error("标准版本名称已存在！");
                        }else{
                            $.ligerDialog.error("保存失败！");
                        }
                        $.ligerDialog.error(data.message);
                    }
                },
                error: function (jqXHR, textStatus, errorThrown) {
                    $("#btn_save").html("确认").css("pointer-events","");
                     $.ligerDialog.error("保存失败！")
                }
            })