esb全流程机构代码与全流程适配版本

Hos-resource/src/main/java/com/yihu/ehr/standard/controller/StandardVersionController.java

@@ -2,6 +2,8 @@ package com.yihu.ehr.standard.controller;
import com.yihu.ehr.framework.model.DictItem;
import com.yihu.ehr.framework.model.DictionaryResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.model.TreeResult;
import com.yihu.ehr.framework.util.controller.BaseController;
import com.yihu.ehr.standard.model.standard.StandardVersionModel;
import com.yihu.ehr.standard.service.standard.StandardVersionService;
@@ -10,6 +12,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
@@ -137,4 +140,17 @@ public class StandardVersionController extends BaseController {
        dictionaryResult.setDetailModelList(detailModelList);
        return dictionaryResult;
    }
    @RequestMapping("getVersion")
    @ResponseBody
    public List<TreeResult> getVersion() {
        try {
            return standardVersionService.getVersion().getDetailModelList();
        }
        catch (Exception ex)
        {
            return null;
        }
    }
}

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

@@ -5,11 +5,14 @@ import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.ehr.framework.constrant.Constants;
import com.yihu.ehr.framework.constrant.ErrorCode;
import com.yihu.ehr.framework.exception.ApiException;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.ehr.framework.model.TreeResult;
import com.yihu.ehr.framework.util.operator.CollectionUtil;
import com.yihu.ehr.framework.util.operator.StringUtil;
import com.yihu.ehr.framework.util.sql.RequestParamTransformer;
import com.yihu.ehr.framework.util.sql.SqlCreator;
import com.yihu.ehr.standard.model.adapter.AdapterSchemeModel;
import com.yihu.ehr.standard.model.adapter.AdapterSchemeVersionModel;
import com.yihu.ehr.standard.model.standard.StandardModel;
import com.yihu.ehr.standard.model.standard.StandardVersionModel;
import com.yihu.ehr.standard.service.bo.StandardVersion;
@@ -18,6 +21,7 @@ import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
import org.json.JSONObject;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -337,4 +341,35 @@ public class StandardVersionService extends SQLGeneralDAO {
        insertBatch(insertSql);
        insertBatch(updateSql);
    }
    public DataGridResult getVersion() throws Exception {
        String SchemeSql = "from AdapterSchemeModel";
        List<AdapterSchemeModel>std=(List<AdapterSchemeModel>)super.hibernateTemplate.find(SchemeSql);
        DataGridResult data=new DataGridResult();
        List<TreeResult>results=new ArrayList<>();
        for(int i=0;i<std.size();i++){
            TreeResult re=new TreeResult();
            //re.setPid("0");
            re.setText(std.get(i).getName());
            re.setId(String.valueOf(std.get(i).getId()));
            results.add(re);
            String sql = "from AdapterSchemeVersionModel ";
            sql+="where schemeId="+std.get(i).getId();
            List<AdapterSchemeVersionModel>stdModel=(List<AdapterSchemeVersionModel>)super.hibernateTemplate.find(sql);
            for(int j=0;j<stdModel.size();j++)
            {
                TreeResult tmpTree=new TreeResult();
                tmpTree.setId(String.valueOf(stdModel.get(j).getId()));
                tmpTree.setText(stdModel.get(j).getName());
                tmpTree.setPid(String.valueOf(std.get(i).getId()));
                results.add(tmpTree);
            }
        }
        data.setTotalCount(results.size());
        data.setDetailModelList(results);
         return data;
    }
}

Hos-resource/src/main/java/com/yihu/ehr/system/dao/OrganizationDao.java

@@ -1,12 +1,15 @@
package com.yihu.ehr.system.dao;
import com.yihu.ehr.dbhelper.jdbc.DBHelper;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.ehr.system.dao.intf.IOrganizationDao;
import com.yihu.ehr.system.model.SystemOrganization;
import org.json.JSONObject;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -15,7 +18,6 @@ import java.util.Map;
 */
@Repository("OrganizationDao")
public class OrganizationDao extends SQLGeneralDAO implements IOrganizationDao {
    /**
     * 获取组织列表
     * @return

Hos-resource/src/main/java/com/yihu/ehr/system/model/SystemOrganization.java

@@ -15,13 +15,24 @@ public class SystemOrganization implements java.io.Serializable {
	private String code;
	private String shortName;
	private String pyCode;
	private String area;
	private String address;
	private String orgType;
	private String settled;
	private String settledWay;
	private String tel;
	private String tags;
	private String qlcOrgCode;
	private String qlcAdapterVersion;
	// Constructors
@@ -167,4 +178,19 @@ public class SystemOrganization implements java.io.Serializable {
		this.tags = tags;
	}
	public String getQlcOrgCode() {
		return qlcOrgCode;
	}
	public void setQlcOrgCode(String qlcOrgCode) {
		this.qlcOrgCode = qlcOrgCode;
	}
	public String getQlcAdapterVersion() {
		return qlcAdapterVersion;
	}
	public void setQlcAdapterVersion(String qlcAdapterVersion) {
		this.qlcAdapterVersion = qlcAdapterVersion;
	}
}

Hos-resource/src/main/resources/hbm/resource/SystemOrganization.hbm.xml

@@ -75,5 +75,15 @@
                <comment>标签</comment>
            </column>
        </property>
        <property name="qlcOrgCode" type="java.lang.String">
            <column name="qlc_org_code" length="50">
                <comment>全流程机构代码</comment>
            </column>
        </property>
        <property name="qlcAdapterVersion" type="java.lang.String">
            <column name="qlc_adapter_version" length="50">
                <comment>全流程适配版本</comment>
            </column>
        </property>
    </class>
</hibernate-mapping>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/org/editorOrganization.jsp

@@ -67,6 +67,18 @@
        </div>
    </div>
    <div class="m-form-group">
        <label>全流程机构代码：</label>
        <div class="m-form-control">
            <input type="text" class="l-textbox"  name="qlcOrgCode"/>
        </div>
    </div>
    <div class="m-form-group">
        <label>全流程适配版本：</label>
        <div class="m-form-control">
            <input type="text" class="l-textbox" id="qlcAdapterVersion" name="qlcAdapterVersion"/>
        </div>
    </div>
    <!-- 隐藏字段 -->
    <div class="m-form-group" style="display: none;">
        <input name="id" hidden="hidden"/>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/org/editorOrganizationJs.jsp

@@ -13,13 +13,29 @@
        },
        initForm: function () {
            var me = this;
            $("#qlcAdapterVersion").ligerComboBox({
                valueField: 'id',
                textField: 'text',
                tree: {
                    url:'/standardCenter/getVersion',
                    //dataParmName: 'detailModelList',
                    textFieldName:"text",
                    idFieldName:"id",
                    parentIDFieldName:"pid",
                    checkbox:false
                }
            });
            $("#selOrgType").ligerComboBox({dict:true,dictName:"ORG_TYPE"});
            $("#selSettledWay").ligerComboBox({dict:true,dictName:"SETTLED_WAY"});
            var modelString = "${model.id}";
            var data;
            if(modelString!=undefined && modelString!=null && modelString.length>0)
            {
                debugger
                data = {
                    id: "${model.id}",
                    code: "${model.code}",
@@ -33,7 +49,9 @@
                    settledWay: "${model.settledWay}",
                    tel: "${model.tel}",
                    tags: "${model.tags}",
                    activityFlag: "${model.activityFlag}"
                    activityFlag: "${model.activityFlag}",
                    qlcOrgCode:"${model.qlcOrgCode}",
                    qlcAdapterVersion:"${model.qlcAdapterVersion}"
                };
                me.actionUrl = "${contextRoot}/org/updateOrg";
@@ -61,6 +79,7 @@
                    return;
                }
                var data = $("#div_info_form").ligerAutoForm("getData");
                debugger
                $.ajax({ //ajax处理
                    type: "POST",
                    url : me.actionUrl,

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/org/organizationJs.jsp

@@ -58,7 +58,7 @@
                }
                me.dialog = $.ligerDialog.open({
                    height: 560,
                    height: 600,
                    width: 600,
                    title: title,
                    url: '${contextRoot}/org/editorOrganization',