Merge branch 'master' of chenyj/cyj into master

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

@@ -22,6 +22,7 @@ import com.yihu.ehr.standard.model.standard.StdDataSetModel;
import com.yihu.ehr.standard.model.standard.StdMetaDataModel;
import com.yihu.ehr.standard.service.bo.AdapterVersion;
import com.yihu.ehr.standard.service.bo.StandardVersion;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.stereotype.Service;
@@ -269,6 +270,9 @@ public class AdapterMetadataService extends SQLGeneralDAO {
        List<AdapterMetadataResultDetailModel> detailModelList = new ArrayList<>();
        for (AdapterMetadataModel model : metadataModelList) {
            if (StringUtils.isBlank(model.getAdapterMetadataCode()) || StringUtils.isBlank(model.getAdapterMetadataName())) {
                continue;
            }
            AdapterMetadataResultDetailModel detailModel = new AdapterMetadataResultDetailModel();
            detailModel.setId(model.getId());
            detailModel.setSchemeId(model.getSchemeId());
@@ -285,8 +289,8 @@ public class AdapterMetadataService extends SQLGeneralDAO {
            detailModel.setStdMetadataName(model.getStdMetadataName());
            if (stdMetaDataModelMap.get(model.getAdapterMetadataId()) != null) {
                detailModel.setAdapterMetadataType(stdMetaDataModelMap.get(model.getAdapterMetadataId()).getColumnType());
                detailModelList.add(detailModel);
            }
            detailModelList.add(detailModel);
        }
        return detailModelList;
    }

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

@@ -247,7 +247,9 @@ public class StdDatasetService extends SQLGeneralDAO {
    public DetailModelResult getDetailModelList(String stdVersion, String condition, String order, Integer rows, Integer page) {
        try {
            List<StdDataSetModel> dataSetModelList = getDatasetList(StdDataSetModel.class, stdVersion, condition, order, rows, page);
            Integer count = getDatasetInt(StdDataSetModel.class, stdVersion, condition);
            List<StdDataSetModel> totalList = getDatasetList(StdDataSetModel.class, stdVersion, condition, order, null, null);
            Integer count = totalList.size();
//            Integer count = getDatasetInt(StdDataSetModel.class, stdVersion, condition);
            DetailModelResult result = DetailModelResult.success("获取标准数据集列表成功");
            result.setDetailModelList(dataSetModelList);
            result.setTotalCount(count);

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

@@ -138,9 +138,9 @@
        stdIdStrLs:"",
        init: function () {
          var me = this;
          var stdVersion = $("#std_version").val();;
          var adapterStdVersion = $("#adapter_std_version").val();;
          var version = $("#version").val();
          var stdVersion = $("#std_version").val();
          var adapterStdVersion = $("#adapter_std_version").val();
          var version = $("#version").val(); //adapter version
          var schemeId = $("#scheme_id").val();
          schemeId = schemeId.replace("scheme","");
          $("#version").val(version);
@@ -161,7 +161,7 @@
                  var stdDatasetId = data.detailModelList[i].stdDatasetId;
                  me.stdIdStrLs += stdDatasetId + ",";
                }
                debugger
                
                me.initGrid(me.stdIdStrLs);
              }
            }
@@ -616,6 +616,7 @@
              ob.stdMetadataId = rowData[i].stdMetadataId == undefined ? "" : rowData[i].stdMetadataId;
              ob.stdMetadataCode = rowData[i].stdMetadataCode == undefined ? "" : rowData[i].stdMetadataCode;
              ob.stdMetadataName = rowData[i].stdMetadataName == undefined ? "" : rowData[i].stdMetadataName;
              ob.adapterDataType = rowData[i].adapterDataType == undefined ? "" : $("#adapterDataType"+i).val();
              ob.stdDictId = rowData[i].stdDictId == undefined ? "" : rowData[i].stdDictId;
              var adapterDatasetCodeArr = $("#adapterDatasetCode"+i).val()==undefined ? "":$("#adapterDatasetCode"+i).val().split(",");
              if(adapterDatasetCodeArr.length>0){
@@ -768,9 +769,9 @@
          var columnCfg =[];
          var width;
          if(status=="1"){//已发布
            width = ["15%","15%","15%","20%","15%","20%"];
            width = ["12%","12%","12%","12%","12%","12%","12%"];
          }else{//未发布
            width = ["15%","15%","15%","15%","15%","15%"];
            width = ["12%","12%","12%","12%","12%","12%","12%"];
          }
          if(cfgModel==0){
@@ -780,6 +781,7 @@
              { display: 'stdMetadataId', name: 'stdMetadataId', hide:true },
              { display: 'adapterDatasetId', name: 'adapterDatasetId', hide:true },
              { display: 'adapterMetadataId', name: 'adapterMetadataId', hide:true },
              { display: 'adapterDataType', name: 'adapterDataType', hide:true },
              { display: '平台数据元编码', name: 'stdMetadataCode',width: width[0], isAllowHide: false ,align:'left' },
              { display: '平台数据元名称', name: 'stdMetadataName',width: width[1], isAllowHide: false ,align:'left' },
              { display: '应用数据集编码', name: 'adapterDatasetCode', width: width[2], render: function (row, rowindex, value, column) {
@@ -842,6 +844,27 @@
                    $('option[value="'+value+'"]',select).attr('selected',true);
                    return  select.prop("outerHTML");
                  }
              }},
              { display: '应用数据元类型', name: 'adapterDataType', width: width[6], render: function (row, rowindex, value, column) {
                debugger
                if(status =="1"){//已发布
                  if(row.adapterDataType == 1) {
                      return "编码";
                  }else{
                    return "值"
                  }
                }else {//未发布
                  var select= $('<div class="f-mt25"><select class="js-example-data-array sel-adapter-metadata-type"  id="adapterDataType'+rowindex +'" >'
                          +'<option value="0">'+'值'+'</option>'
                          +'<option value="1">'+'编码'+'</option></select></div>');
                  if(row.adapterDataType == null){
                     value = 0;
                  }
                  $('option[value="'+value+'"]',select).attr('selected',true);
                  return  select.prop("outerHTML");
                }
              }}
            ]