适配保存失败

hos-parent/pom.xml

@@ -74,23 +74,10 @@
        <java.version>1.8</java.version>
    </properties>
    <pluginRepositories>
        <pluginRepository>
            <id>pluginCentral</id>
            <name>pluginCentral</name>
            <url>http://172.19.103.43:8081/nexus/content/repositories/central/</url>
        </pluginRepository>
        <pluginRepository>
            <id>pluginReleases</id>
            <name>pluginReleases</name>
            <url>http://172.19.103.43:8081/nexus/content/repositories/releases/</url>
        </pluginRepository>
    </pluginRepositories>
    <!--用于发布到服务器 对应setting的对应server表情里面的id -->
    <distributionManagement>
        <repository>
            <id>Releases</id>
            <id>releases</id>
            <name>Releases</name>
            <url>http://172.19.103.43:8081/nexus/content/repositories/releases/</url>
        </repository>
@@ -100,6 +87,7 @@
            <url>http://172.19.103.43:8081/nexus/content/repositories/snapshots/</url>
        </snapshotRepository>
    </distributionManagement>
    <repositories>
        <repository>
            <id>repositoryCentral</id>

hos-rest/src/main/java/com/yihu/hos/rest/services/crawler/QCDataUpload.java

@@ -73,6 +73,7 @@ public class QCDataUpload {
        try {
            if (zipFile == null || zipFile.file == null) {
                logger.info("压缩质控数据失败,质控数据未生成,patient_id:" + patient.getPatientId() + ",event_no:" + patient.getEventNo());
                FileUtil.deleteDirectory(new File(zipFile.directory));
                return false;
            }

src/main/java/com/yihu/hos/standard/service/adapter/AdapterMetadataService.java

@@ -317,7 +317,9 @@ public class AdapterMetadataService extends SQLGeneralDAO {
                adapterMetadataModel.setStdMetadataName(metadataModel.getStdMetadataName());
                adapterMetadataModel.setAdapterInfo(metadataModel.getAdapterInfo());
                idList.add(metadataModel.getStdDatasetId());
                metadataResultMap.put(metadataModel.getStdDatasetId(), metadataModel);
                if (!StringUtil.isEmpty(metadataModel.getAdapterDatasetCode())){
                    metadataResultMap.put(metadataModel.getStdDatasetId(), metadataModel);
                }
                JsonNode jsonNode = objectMapper.readTree(objectMapper.writeValueAsString(adapterMetadataModel));
                SqlCreator sqlCreator = new SqlCreator(AdapterMetadataModel.class);
                String sql = sqlCreator.updateDataByTableKey(version.getMetaDataTableName(), jsonNode);
@@ -344,6 +346,7 @@ public class AdapterMetadataService extends SQLGeneralDAO {
                    query = getExeuteQuery(sqlCreator, sql);
                    query.executeUpdate();
                }
//                 insertBatch( sqlList);
            }
            DetailModelResult detailModelResult = DetailModelResult.success("修改适配数据元成功");
            detailModelResult.setDetailModelList(adapterMetadataList);

src/main/java/com/yihu/hos/system/service/SystemManager.java

@@ -1,6 +1,7 @@
package com.yihu.hos.system.service;
import com.yihu.hos.common.constants.ContextAttributes;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.interceptor.LocalContext;
import com.yihu.hos.system.model.SystemUser;
import com.yihu.hos.tenant.model.TenantSession;
@@ -34,6 +35,14 @@ public class SystemManager {
    {
        ActionResult result = null;
        TenantSession tenantSession = (TenantSession)session.getAttribute(ContextAttributes.TENANT_SESSION);
        if (StringUtil.isEmpty(saasAdmin)){
            System.out.println("saasAdmin 为空！");
        }
        if (tenantSession == null){
            result = new ActionResult(false,"登录失败！用户登录超时！");
            return result;
        }
        if (saasAdmin.equals(tenantSession.getTenant())){
            tenantSession.setRole("admin");//标识为中心管理员角色
        }

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

@@ -769,8 +769,12 @@
          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.adapterDatasetId = rowData[i].adapterDatasetId == undefined ? "" : rowData[i].adapterDatasetId;
          ob.adapterDatasetCode = rowData[i].adapterDatasetCode == undefined ? "" : rowData[i].adapterDatasetCode;
          ob.adapterDatasetName = rowData[i].adapterDatasetName == undefined ? "" : rowData[i].adapterDatasetName;
          ob.stdDictId = rowData[i].stdDictId == undefined ? "" : rowData[i].stdDictId;
          var adapterDatasetCodeArr = $("#adapterDatasetCode"+i).val()==undefined ? "":$("#adapterDatasetCode"+i).val().split(",");
          debugger
          if(adapterDatasetCodeArr.length>0){
            ob.adapterDatasetId = adapterDatasetCodeArr[0];
            ob.adapterDatasetName = adapterDatasetCodeArr[1];
@@ -794,6 +798,7 @@
            ob.adapterMetadataName = "";
          }
          ob.adapterMetadataCode = $("#adapterMetadataCode"+i).text() == undefined ? "" : $("#adapterMetadataCode"+i).text();
          debugger
          dataResult.push(ob)
        }
        //保存数据
@@ -926,7 +931,10 @@
      var btnObj//自动匹配的按钮
      var url//链接
      var isDataSet = $("#isDataSet").val();
      if(isDataSet!="0"){//数据集
      if(isDataSet=="0"){//字典
        obj=$("#zidian .boxleft");
        url="${contextRoot}/adapterCenter/strategyDic"
      }else{//数据集
        obj=$("#shujuji .boxleft");
        url="${contextRoot}/adapterCenter/strategy"
      }
@@ -949,7 +957,9 @@
      var url=""//进度
      var isDataSet = $("#isDataSet").val();
      var version = $("#version").val();
      if(isDataSet!="0"){//数据集
      if(isDataSet=="0"){//字典
        url="${contextRoot}/adapterCenter/getStrategyDicSize"
      }else{//数据集
        url="${contextRoot}/adapterCenter/getStrategySize"
      }
      var timeIng =setInterval(function(){
@@ -1117,6 +1127,8 @@
      var isDataSet = $("#isDataSet").val()
      if(isDataSet=="0"){//字典
        url="${contextRoot}/adapterCenter/endStrategyDic"
      }else{//数据集
        url="${contextRoot}/adapterCenter/endStrategy"
      }
      $.ajax({
        type:"POST",
@@ -1200,9 +1212,11 @@
              if(row.adapterDatasetId==undefined || row.adapterDatasetCode==undefined || row.adapterDatasetName==undefined){
                select= $('<div class="f-mt25"><select class="js-example-data-array sel-adapter-dataset-code"  id="adapterDatasetCode'+rowindex +'" ></select></div>');
                dataRows++;
                debugger
              }else{
                select= $('<div class="f-mt25"><select class="js-example-data-array sel-adapter-dataset-code"  id="adapterDatasetCode'+rowindex+'" >'
                        +'<option value="'+row.adapterDatasetId+','+row.adapterDatasetName+'">'+row.adapterDatasetCode+'</option></select></div>');
             debugger
              }
              $('option[value="'+value+'"]',select).attr('selected',true);
              return  select.prop("outerHTML");