Merge branch 'master' of chenyj/cyj into master

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

@@ -14,7 +14,6 @@ import com.yihu.ehr.framework.util.sql.BeanTransformer;
import com.yihu.ehr.framework.util.sql.RequestParamTransformer;
import com.yihu.ehr.framework.util.sql.SqlCreator;
import com.yihu.ehr.standard.model.Select2;
import com.yihu.ehr.standard.model.adapter.AdapterMetadataModel;
import com.yihu.ehr.standard.model.standard.*;
import com.yihu.ehr.standard.model.standard.resultModel.StandardParamResultModel;
import com.yihu.ehr.standard.service.bo.StandardVersion;
@@ -311,7 +310,7 @@ public class StdMetadataService extends SQLGeneralDAO {
            List<Select2> detailModelList = new ArrayList<>();
            for (StdMetaDataModel metaDataModel : metadataList) {
                Select2 select2 = new Select2();
                select2.setId(metaDataModel.getId() + Constants.COMMA + metaDataModel.getCode());
                select2.setId(metaDataModel.getId() + Constants.COMMA + metaDataModel.getCode() + Constants.COMMA +  metaDataModel.getDictId());
                select2.setText(metaDataModel.getName());
                detailModelList.add(select2);
            }

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

@@ -171,7 +171,7 @@
        },
        initGrid: function (stdIdStrLs) {
          debugger
          
          var me = this;
          this.grid = $("#div_left_grid").ligerGrid({
            url: '${contextRoot}'+cfg[cfgModel].left.search,
@@ -182,7 +182,7 @@
            validate : true,
            unSetValidateAttr:false,
            onBeforeShowData: function (data) {
              debugger
              
              if(data.detailModelList.length==0){
                entryMaster.reloadGrid('');
              }
@@ -207,7 +207,7 @@
        },
        reloadGrid: function () {
          debugger
          
          var me = this;
          var searchNm = $("#searchNm").val();
          var values = {
@@ -480,7 +480,7 @@
          this.bindEvents();
        },
        reloadGrid: function (parentId) {
          debugger
          
          var searchNmEntry = $("#searchNmEntry").val();
          if(Util.isStrEmpty(parentId)){
            var row = master.grid.getSelectedRow();
@@ -631,6 +631,11 @@
              if(adapterMetadataCodeArr.length>0){
                ob.adapterMetadataId = adapterMetadataCodeArr[0];
                ob.adapterMetadataName = adapterMetadataCodeArr[1];
                if(adapterMetadataCodeArr.length >2){
                  ob.adapterDictId = adapterMetadataCodeArr[2];
                }else {
                  ob.adapterDictId = "";
                }
              }else {
                ob.adapterMetadataId = "";
                ob.adapterMetadataName = "";
@@ -769,9 +774,9 @@
          var columnCfg =[];
          var width;
          if(status=="1"){//已发布
            width = ["12%","12%","12%","12%","12%","12%","12%"];
            width = ["15%","15%","15%","15%","15%","12%","12%"];
          }else{//未发布
            width = ["12%","12%","12%","12%","12%","12%","12%"];
            width = ["12%","12%","12%","15%","12%","15%","12%"];
          }
          if(cfgModel==0){
@@ -823,8 +828,13 @@
                      if(row.adapterMetadataId==undefined || row.adapterMetadataCode==undefined || row.adapterMetadataName==undefined){
                        select= $('<div class="f-mt25"><select class="js-example-data-array sel-adapter-metadata-code"  id="adapterMetadataCode'+rowindex +'" ></select></div>');
                      }else{
                        select= $('<div class="f-mt25"><select class="js-example-data-array sel-adapter-metadata-code"  id="adapterMetadataCode'+rowindex+'" >'
                                +'<option value="'+row.adapterMetadataId+','+row.adapterMetadataName+'">'+row.adapterMetadataCode+'</option></select></div>');
                        if(row.adapterDictId==undefined) {
                          select = $('<div class="f-mt25"><select class="js-example-data-array sel-adapter-metadata-code"  id="adapterMetadataCode'+rowindex+'" >'
                                  +'<option value="'+row.adapterMetadataId+','+row.adapterMetadataName+'">'+row.adapterMetadataCode+'</option></select></div>');
                        }else {
                          select= $('<div class="f-mt25"><select class="js-example-data-array sel-adapter-metadata-code"  id="adapterMetadataCode'+rowindex+'" >'
                                  +'<option value="'+row.adapterMetadataId+','+row.adapterMetadataName+','+row.adapterDictId +'">'+row.adapterMetadataCode+'</option></select></div>');
                        }
                      }
                      $('option[value="'+value+'"]',select).attr('selected',true);
                      return  select.prop("outerHTML");
@@ -846,7 +856,7 @@
                  }
              }},
              { display: '应用数据元类型', name: 'adapterDataType', width: width[6], render: function (row, rowindex, value, column) {
                debugger
                
                if(status =="1"){//已发布
                  if(row.adapterDataType == 1) {
                      return "编码";
@@ -1093,7 +1103,12 @@
        var selectId = "";
        var selectText = "";
        if(arr.length>0 && requestType=="change"){
          var option = '<option value="'+arr[0]+","+  $('#'+that.attr("id")).find("option:selected").text()+'">'+arr[1]+'</option>';
          var option ="";
          if(arr.length >2) {
            option = '<option value="'+arr[0]+","+  $('#'+that.attr("id")).find("option:selected").text()+'">'+arr[1]+ "," + arr[2] + '</option>';
          }else {
            option = '<option value="'+arr[0]+","+  $('#'+that.attr("id")).find("option:selected").text()+'">'+arr[1]+'</option>';
          }
          $("#"+changeTarget+index).html("");
          $("#"+changeTarget+index).append(option);
          if(targer=="adapterDatasetCode" || targer=="adapterDatasetName" || targer=="adapterDictCode" || targer=="adapterDictName"){
@@ -1116,7 +1131,7 @@
              dataType : "json",
              url: url,
              processResults: function (data, page) {
                
                if(data.successFlg){
                  if(targer=="adapterDatasetCode" || targer=="adapterMetadataCode"
                          || targer=="adapterDictCode" || targer=="adapterEntryCode" || targer=="stdEntryCode"){//由于机构适配值的数据格式为id：id+“，”+code，text：name，但是机构适配值为id:id+","+name,text:code,所以需要重新组装数据
@@ -1129,7 +1144,12 @@
                    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 id = "";
                      if(resultData[i].id.split(",").length >2) {
                         id = resultData[i].id==null?"": resultData[i].id.split(",")[0]+","+name + "," + resultData[i].id.split(",")[2];
                      }else {
                        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);