Merge branch 'master' of chenyj/cyj into master

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

@@ -310,7 +310,11 @@ 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() + Constants.COMMA +  metaDataModel.getDictId());
                if (metaDataModel.getDictId() != null) {
                    select2.setId(metaDataModel.getId() + Constants.COMMA + metaDataModel.getCode() + Constants.COMMA + metaDataModel.getDictId());
                } else {
                    select2.setId(metaDataModel.getId() + Constants.COMMA + metaDataModel.getCode());
                }
                select2.setText(metaDataModel.getName());
                detailModelList.add(select2);
            }

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

@@ -1099,13 +1099,12 @@
      }
      function selectBind(that,arr,requestType,targer,changeTarget,index,url) {
        
        var selectId = "";
        var selectText = "";
        if(arr.length>0 && requestType=="change"){
          var option ="";
          if(arr.length >2) {
            option = '<option value="'+arr[0]+","+  $('#'+that.attr("id")).find("option:selected").text()+'">'+arr[1]+ "," + arr[2] + '</option>';
          if(arr.length >2 && arr[2]!=undefined) {
            option = '<option value="'+arr[0]+","+  $('#'+that.attr("id")).find("option:selected").text()+ "," + arr[2] +'">'+arr[1]+'</option>';
          }else {
            option = '<option value="'+arr[0]+","+  $('#'+that.attr("id")).find("option:selected").text()+'">'+arr[1]+'</option>';
          }
@@ -1146,7 +1145,9 @@
                      var name = resultData[i].text;
                      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];
                        if(resultData[i].id.split(",")[2] != undefined) {
                          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 ;
                      }