Merge branch 'master' of chenyj/cyj into master

Hos-Framework/src/main/java/com/yihu/ehr/framework/constrant/Constants.java

@@ -68,6 +68,7 @@ public class Constants {
    public static final String VALUE_STR = "value";
    public static final String STANDARD = "standard";
    public static final String STANDARD_EHR = "standard_ehr";
    public static final String STANDARD_ORG = "standard_org";
    public static final String OK = "ok";
    public static final String NO = "no";
    public static final Integer NUMBER_ZREO = 0;

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

@@ -214,12 +214,17 @@ public class StandardService extends SQLGeneralDAO {
        Criteria criteria = getCurrentSession().createCriteria(SystemParam.class);
        criteria.add(Restrictions.eq("paramKey", paramKey));
        SystemParam systemParam = (SystemParam) criteria.uniqueResult();
        Criteria criteria1 = getCurrentSession().createCriteria(SystemParam.class);
        criteria1.add(Restrictions.eq("paramKey", Constants.STANDARD_ORG));
        SystemParam systemParam1 = (SystemParam) criteria1.uniqueResult();
        if (systemParam != null) {
            StandardParamResultModel standardParamResultModel = new StandardParamResultModel();
            standardParamResultModel.setSuccessFlg(true);
            standardParamResultModel.setMessage("获取参数成功");
            standardParamResultModel.setCode(systemParam.getParamValue());
            standardParamResultModel.setOrgCode(systemParam.getOrgId());
            standardParamResultModel.setOrgCode(systemParam1.getParamValue());
            return standardParamResultModel;
        } else {
            StandardParamResultModel standardParamResultModel = new StandardParamResultModel();
@@ -339,8 +344,9 @@ public class StandardService extends SQLGeneralDAO {
            }
        }
        StandardParamResultModel standardParam = getStandardParam(Constants.STANDARD);
        StandardParamResultModel standardParam1= getStandardParam(Constants.STANDARD_ORG);
        String code = standardParam.getCode();
        String orgCode = standardParam.getOrgCode();
        String orgCode = standardParam1.getCode();
        List<SystemOrganization> publisherModelList = new ArrayList<>();
        Criteria criteria = getCurrentSession().createCriteria(StandardModel.class);

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

@@ -110,7 +110,7 @@ public class StdPublisherService extends SQLGeneralDAO {
    public Result getStandardPublisher() {
        try {
            String paramSql = "select s.org_id from system_param s where s.param_key = '"+ Constants.STANDARD+"'";
            String paramSql = "select s.param_value from system_param s where s.param_key = '"+ Constants.STANDARD_ORG+"'";
            Query paramQuery = getCurrentSession().createSQLQuery(paramSql);
            String publisherCode = (String) paramQuery.uniqueResult();
            Criteria criteria = getCurrentSession().createCriteria(SystemOrganization.class);

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

@@ -480,7 +480,7 @@
          this.bindEvents();
        },
        reloadGrid: function (parentId) {
          debugger
          var searchNmEntry = $("#searchNmEntry").val();
          if(Util.isStrEmpty(parentId)){
            var row = master.grid.getSelectedRow();
@@ -607,6 +607,7 @@
          if (cfgModel == 0) {
            var dataResult = new Array();
            var rowData = entryMaster.grid.getData();
            debugger
            for (var i = 0; i < rowData.length; i++) {
              var ob = new Object();
              ob.id = rowData[i].id == undefined ? "" : rowData[i].id;
@@ -615,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.stdDictId = rowData[i].stdDictId == undefined ? "" : rowData[i].stdDictId;
              var adapterDatasetCodeArr = $("#adapterDatasetCode"+i).val()==undefined ? "":$("#adapterDatasetCode"+i).val().split(",");
              if(adapterDatasetCodeArr.length>0){
                ob.adapterDatasetId = adapterDatasetCodeArr[0];
@@ -704,7 +706,6 @@
              $.ligerDialog.error("在同一个适配方案下，同一个平台标准字典对应的平台字典项和应用字典项不可重复！");
              return false;
            }
            //保存数据
            $.ajax({
              type : "POST",