Przeglądaj źródła

标准适配显示错乱修复

huangzhiyong 7 lat temu
rodzic
commit
eb532522d1

+ 10 - 1
src/main/java/com/yihu/hos/standard/model/adapter/resultModel/AdapterSchemeResultDetailModel.java

@ -13,7 +13,8 @@ public class AdapterSchemeResultDetailModel implements Serializable {
    String stdName;
    String stdVersionName;
    String stdVersion;
    String publisher;
    String stdPublisher;
    String publisher; //源发布者
    String adapterName;
    String adapterVersionName;
    String adapterStdVersion;
@ -141,4 +142,12 @@ public class AdapterSchemeResultDetailModel implements Serializable {
    public void setVersionList(List<AdapterSchemeVersionModel> versionList) {
        this.versionList = versionList;
    }
    public String getStdPublisher() {
        return stdPublisher;
    }
    public void setStdPublisher(String stdPublisher) {
        this.stdPublisher = stdPublisher;
    }
}

+ 1 - 0
src/main/java/com/yihu/hos/standard/service/adapter/AdapterSchemeService.java

@ -224,6 +224,7 @@ public class AdapterSchemeService extends SQLGeneralDAO {
                resultDetailModel.setStdName(stdMap.get(schemeModel.getStdId()).getName());
                resultDetailModel.setStdVersion(stdVersionMap.get(schemeModel.getStdVersion()).getVersion());
                resultDetailModel.setStdVersionName(stdVersionMap.get(schemeModel.getStdVersion()).getName());
                resultDetailModel.setStdPublisher(stdMap.get(schemeModel.getStdId()) == null ? "" : stdMap.get(schemeModel.getStdId()).getPublisher());
                resultDetailModel.setPublisher(stdMap.get(schemeModel.getAdapterStdId()) == null ? "" : stdMap.get(schemeModel.getAdapterStdId()).getPublisher());
                resultDetailModel.setAdapterName(stdMap.get(schemeModel.getAdapterStdId()) == null ? "" : stdMap.get(schemeModel.getAdapterStdId()).getName());
                if (stdVersionMap.get(schemeModel.getAdapterStdVersion()) != null) {

+ 3 - 3
src/main/webapp/WEB-INF/ehr/jsp/standard/adapterplan/adapterDetailJs.jsp

@ -52,10 +52,11 @@
                  name: data.name,
                  description: data.description,
                  stdId: data.stdId,
                  adapterPublisherOrgCode:data.adapterPublisherOrgCode,
                  stdVersion: data.stdVersion,
                  stdPublisherOrgCode:data.stdPublisherOrgCode,
                  adapterStdId: data.adapterStdId,
                  adapterStdVersion: data.adapterStdVersion,
                  adapterPublisherOrgCode:data.adapterPublisherOrgCode,
                  id:data.id,
                  parentId:data.parentId,
                  type:data.type,
@ -155,7 +156,6 @@
          //目标机构名称change事件
          $("#sel_stdPublisherOrgCode").change(function(){
            var publisherOrgCode = $("#sel_stdPublisherOrgCode").ligerGetComboBoxManager().getValue();
            if(!Util.isStrEmpty(publisherOrgCode)){
              //目标标准名称
              $("#sel_stdId").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getStandards" ,//?condition={\"type\":1,\"publisherOrgCode\":\""+publisherOrgCode+"\"}
@ -213,7 +213,7 @@
          //源机构名称change事件
          $("#sel_publisherOrgCode").change(function(){
            var publisherOrgCode = $("#sel_publisherOrgCode").ligerGetComboBoxManager().getValue();
            debugger
            if(!Util.isStrEmpty(publisherOrgCode)){
              //源标准名称
              $("#sel_adapterStdId").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getStandards" ,//?condition={\"type\":1,\"publisherOrgCode\":\""+publisherOrgCode+"\"}

+ 6 - 5
src/main/webapp/WEB-INF/ehr/jsp/standard/adapterplan/indexJs.jsp

@ -34,11 +34,12 @@
            return ' <div style="vertical-align:middle;margin-top: 10px;"><span>未发布  </span><img src="${contextRoot}/develop/images/button/fabuwei_icon.png"/></a></div>';
          }
        }},
        { display: '源标准名称', name: 'stdName',width: '15%', type: 'int', align: 'center' },
        { display: '源标准版本', name: 'stdVersionName', width: '10%', align: 'center' },
        { display: '发布机构名称', name: 'publisher', width: '10%', align: 'center' },
        { display: '发布机构标准', name: 'adapterName', width: '10%', align: 'center' },
        { display: '机构标准版本', name: 'adapterVersionName', width: '10%', align: 'center' },
        { display: '目标发布机构', name: 'stdPublisher', width: '10%', align: 'center' },
        { display: '目标标准名称', name: 'stdName',width: '15%', type: 'int', align: 'center' },
        { display: '目标标准版本', name: 'stdVersionName', width: '10%', align: 'center' },
        { display: '源发布机构', name: 'publisher', width: '10%', align: 'center' },
        { display: '源标准', name: 'adapterName', width: '10%', align: 'center' },
        { display: '源标准版本', name: 'adapterVersionName', width: '10%', align: 'center' },
        {
          display: '操作', isSort: false, width: '20%',align: 'center', render: function (rowdata, rowindex, value) {
          var html = '<div class="m-inline-buttons" style="width:200px;">';