代码合并

Hos-Resource-Rest/src/main/java/com/yihu/hos/filter/CharFilter.java

@@ -0,0 +1,32 @@
package com.yihu.hos.filter;
import org.springframework.stereotype.Component;
import javax.servlet.*;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
/**
 * Created by Administrator on 2016/4/26.
 */
@Component("charFilter")
public class CharFilter implements Filter {
    @Override
    public void init(FilterConfig filterConfig) throws ServletException {
    }
    @Override
    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
        response.setContentType("application/json;charset=UTF-8");
        request.setCharacterEncoding("UTF-8");
        response.setCharacterEncoding("UTF-8");
        chain.doFilter(request, response);
    }
    @Override
    public void destroy() {
    }
}

Hos-Resource-Rest/src/main/java/com/yihu/hos/gateway/control/GatewayControl.java

@@ -1,5 +1,6 @@
package com.yihu.hos.gateway.control;
import com.yihu.hos.gateway.thread.ResponseThread;
import com.yihu.hos.gateway.exception.EHRException;
import com.yihu.hos.gateway.exception.EHRExceptionConstant;
import com.yihu.hos.gateway.model.rest.RestRequsetResult;
@@ -7,20 +8,27 @@ import com.yihu.hos.gateway.model.rest.RestResponseResult;
import com.yihu.hos.gateway.service.intf.IGatewayService;
import com.yihu.hos.resource.util.httpclient.HttpClientUtil;
import com.yihu.hos.resource.viewModel.ResourceRestDetailModel;
import com.yihu.hos.resource.viewModel.SQLResponResult;
import net.sf.json.JSONObject;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.io.Writer;
/**
 * Created by chenweida on 2016/1/27.
 * EHR平台应用 REST请求
 */
@RestController
@Controller
@RequestMapping("/gateway")
public class GatewayControl {
    @Autowired
@@ -41,35 +49,63 @@ public class GatewayControl {
     * @param request
     * @return
     */
    @ResponseBody
    @RequestMapping("/transfer")
    public RestResponseResult transfer(HttpServletRequest request) {
    public void transfer(HttpServletRequest request, HttpServletResponse response) throws Exception {
        request.setCharacterEncoding("UTF-8");
        response.setContentType("application/json;charset=UTF-8");
        Writer writer = response.getWriter();
        response.setCharacterEncoding("UTF-8");
        String returnString = "";
        boolean isSyn = false;//是否异步
        String resultData = null;
        RestRequsetResult restRequsetResult = new RestRequsetResult();
        RestResponseResult restResponseResult = new RestResponseResult();
        try {
            BeanUtils.populate(restRequsetResult, request.getParameterMap());
            //---start  扩展type和data两个参数 作用于API和param一样
            if (StringUtils.isEmpty(restRequsetResult.getApi())) {
                restRequsetResult.setApi(restRequsetResult.getType());
                isSyn = true;
            }
            if (StringUtils.isEmpty(restRequsetResult.getParam())) {
                restRequsetResult.setParam(restRequsetResult.getData());
            }
            //---end
            //判断参数是否为空
            paramsIsNotNull(restRequsetResult.getApi());
            //根据API得到资源对象
            ResourceRestDetailModel resourceRestDetailModel = gatewayService.getResourceRestDetailModelByCode(restRequsetResult.getApi());
            //根据资源对象的信息还有访问的参数通过httpclient得到数据
            resultData = getResultData(resourceRestDetailModel, restRequsetResult.getParam());
            restResponseResult = (RestResponseResult) JSONObject.toBean(JSONObject.fromObject(resultData), RestResponseResult.class);
            restResponseResult.setRequestId(restRequsetResult.getRequestId());
            if (isSyn) {
                new Thread(new ResponseThread(httpClientUtil,
                        resourceRestDetailModel.getUrl() + resourceRestDetailModel.getNamespace().replace(".", "/"),
                        resourceRestDetailModel.getUsername(),
                        resourceRestDetailModel.getPassword(),
                        JSONObject.fromObject(resourceRestDetailModel.getParam()),
                        resourceRestDetailModel.getType())).start();
                returnString = JSONObject.fromObject(new SQLResponResult()).toString();
            } else {
                resultData = getResultData(resourceRestDetailModel, restRequsetResult.getParam());
                returnString = resultData;
            }
        } catch (Exception e) {
            e.printStackTrace();
            if (e instanceof EHRException) {
                //我们自己定义的异常,业务出错
                EHRException eHRException = (EHRException) e;
                return RestResponseResult.getError(eHRException.getExceptionCode(), eHRException.getExceptionMessage());
                returnString = JSONObject.fromObject(RestResponseResult.getError(eHRException.getExceptionCode(), eHRException.getExceptionMessage())).toString();
            } else {
                //系统的异常
                return RestResponseResult.getError(EHRExceptionConstant.EHREXCEPTION_SYSTEMEXCEPTION, EHRExceptionConstant.EHREXCEPTION_SYSTEMEXCEPTION_MESSAGE);
                returnString = JSONObject.fromObject(RestResponseResult.getError(EHRExceptionConstant.EHREXCEPTION_SYSTEMEXCEPTION, EHRExceptionConstant.EHREXCEPTION_SYSTEMEXCEPTION_MESSAGE)).toString();
            }
        }
        return restResponseResult;
        writer.write(returnString);
        writer.flush();
        writer.close();
    }
    /**

Hos-Resource-Rest/src/main/java/com/yihu/hos/gateway/model/rest/RestRequsetResult.java

@@ -16,6 +16,10 @@ public class RestRequsetResult implements Serializable {
    private String api;
    private String param;
    private String requestId;
    //以下参数是作为全流程对接情况处理的参数---start
    private String type;//作用和api参数一样
    private String data;//作用和data参数一样
    //---end
    public String getApi() {
        return api;
@@ -41,6 +45,22 @@ public class RestRequsetResult implements Serializable {
        this.requestId = requestId;
    }
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    public String getData() {
        return data;
    }
    public void setData(String data) {
        this.data = data;
    }
    @Override
    public String toString() {
        return "{" +
@@ -51,16 +71,16 @@ public class RestRequsetResult implements Serializable {
    }
    public static void main(String[] args) {
        InvokeRequest r=new InvokeRequest(new Url("127.0.0.1",8891),"com.yihu.hos.gateway.control.rpc.IResourceRpc","transport",String.class);
         r.add(String.class,"你好");
         r.setSendTimeOutMills(3000);//设置默认的超时时间
         r.setSyncMode();//设置调用模式为同步模式
         try {
             Object s=Rpc.invoke(r);
             System.out.println(s.toString());
           } catch (Exception e1) {
                e1.printStackTrace();
         }//调用并返回结果
        InvokeRequest r = new InvokeRequest(new Url("127.0.0.1", 8891), "com.yihu.hos.gateway.control.rpc.IResourceRpc", "transport", String.class);
        r.add(String.class, "你好");
        r.setSendTimeOutMills(3000);//设置默认的超时时间
        r.setSyncMode();//设置调用模式为同步模式
        try {
            Object s = Rpc.invoke(r);
            System.out.println(s.toString());
        } catch (Exception e1) {
            e1.printStackTrace();
        }//调用并返回结果
    }
}

Hos-Resource-Rest/src/main/java/com/yihu/hos/gateway/thread/ResponseThread.java

@@ -0,0 +1,47 @@
package com.yihu.hos.gateway.thread;
import com.yihu.hos.gateway.exception.EHRException;
import com.yihu.hos.gateway.exception.EHRExceptionConstant;
import com.yihu.hos.resource.util.httpclient.HttpClientUtil;
import com.yihu.hos.resource.viewModel.ResourceRestDetailModel;
import net.sf.json.JSONObject;
/**
 * Created by Administrator on 2016/4/25.
 */
public class ResponseThread implements Runnable {
    private String url = "";
    private String username = "";
    private String password = "";
    private String type = "";
    private JSONObject param;
    private HttpClientUtil httpClientUtil = null;
    public ResponseThread(HttpClientUtil httpClientUtil, String url, String username, String password, JSONObject param, String type) {
        this.httpClientUtil = httpClientUtil;
        this.url = url;
        this.username = username;
        this.password = password;
        this.param = param;
        this.type = type;
    }
    @Override
    public void run() {
        String returnData = null;
        //拼凑出URL
        try {
            //根据配置好的类型判断是get还是post
            if (ResourceRestDetailModel.ResourceRest_TYPE_GET.equals(type)) {
                returnData = httpClientUtil.doGet(url, JSONObject.fromObject(param), username, password);
            } else if (ResourceRestDetailModel.ResourceRest_TYPE_POST.equals(type)) {
                returnData = httpClientUtil.doPost(url, JSONObject.fromObject(param), username, password);
            } else {
                throw new EHRException(EHRExceptionConstant.EHREXCEPTION_BUSINESS_REOURCE_TYPE_EXCEPTION, EHRExceptionConstant.EHREXCEPTION_BUSINESS_REOURCE_TYPE_EXCEPTION_MESSAGE);
            }
        } catch (Exception e) {
            e.printStackTrace();
        }
    }
}

Hos-Resource-Rest/src/main/java/com/yihu/hos/qlc/controller/QLCController.java

@@ -5,6 +5,7 @@ import com.yihu.hos.config.Config;
import com.yihu.hos.gateway.model.rest.RestResponseResult;
import com.yihu.hos.gateway.util.RPCUtil;
import com.yihu.hos.resource.util.httpclient.HttpClientUtil;
import com.yihu.hos.resource.viewModel.SQLResponResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -48,16 +49,23 @@ public class QLCController {
     */
    @RequestMapping(value = "/queryUserInfo", method = RequestMethod.POST)
    @ApiOperation(value = "挂号事件推送", response = Object.class, produces = "application/json", notes = "院方挂号事件推送")
    public RestResponseResult queryUserInfo(@ApiParam(value = "事件类型:门诊、住院", required = true) @RequestParam(value = "EventType") String EventType,
                                            @ApiParam(value = "事件编码：门诊号、住院号", required = true) @RequestParam(value = "EventNo") String EventNo,
                                            @ApiParam(value = "卡类型", required = true) @RequestParam(value = "CardType") String CardType,
                                            @ApiParam(value = "卡号", required = true) @RequestParam(value = "CardNo") String CardNo,
                                            @ApiParam(value = "PatientId", required = true) @RequestParam(value = "PatientId") String PatientId,
                                            @ApiParam(value = "医院ID", required = true) @RequestParam(value = "HospitalId") String HospitalId,
                                            HttpServletRequest request) {
        RestResponseResult restResponseResult = new RestResponseResult();
    public SQLResponResult queryUserInfo(@ApiParam(value = "事件类型:门诊、住院", required = true) @RequestParam(value = "EventType") String EventType,
                                         @ApiParam(value = "事件编码：门诊号、住院号", required = true) @RequestParam(value = "EventNo") String EventNo,
                                         @ApiParam(value = "卡类型", required = true) @RequestParam(value = "CardType") String CardType,
                                         @ApiParam(value = "卡号", required = true) @RequestParam(value = "CardNo") String CardNo,
                                         @ApiParam(value = "PatientId", required = true) @RequestParam(value = "PatientId") String PatientId,
                                         @ApiParam(value = "医院ID", required = true) @RequestParam(value = "HospitalId") String HospitalId,
                                         HttpServletRequest request) {
        SQLResponResult restResponseResult = new SQLResponResult();
        Object s = null;
        try {
            isEmpty(EventType, "EventType is null");
            isEmpty(EventNo, "EventNo is null");
            isEmpty(CardType, "CardType is null");
            isEmpty(CardNo, "CardNo is null");
            isEmpty(PatientId, "PatientId is null");
            isEmpty(HospitalId, "HospitalId is null");
            String param = "<Req><TransactionCode>5001</TransactionCode><Data><CardType>" + CardType + "</CardType><CardNo>" + CardNo + "</CardNo><PatientId>" + PatientId + "</PatientId></Data></Req>";
            String apiparam = "{\"ChannelId\"=\"" + Config.channelId + "\"," +
                    "\"ParamType\"=1," +
@@ -83,40 +91,51 @@ public class QLCController {
                Map<String, Object> params = new HashMap<String, Object>();
                params.put("dataset", "HDSA00_01");
                params.put("data", obj.toString());
                httpClientUtil.doPost(Config.monogoUrl, params, null, null);
                String monogoUrl = httpClientUtil.doPost(Config.monogoUrl, params, null, null);
                monogoUrlValid(monogoUrl);
                //出發採集上傳
                params = new HashMap<String, Object>();
                params.put("orgCode", HospitalId);
                params.put("cardNo", CardNo);
                params.put("eventNo", PatientId);
                httpClientUtil.doPost(Config.startCollect, params, null, null);
                String startCollect = httpClientUtil.doPost(Config.startCollect, params, null, null);
                monogoUrlValid(startCollect);
            } else {
                throw new Exception("RPC返回RespCode：" + root.element("RespCode").getText());
                throw new Exception(s.toString());
            }
        } catch (Exception e) {
            restResponseResult.setResponseCode("20000");
            restResponseResult.setResponseMessage(e.getMessage() + "RPC:返回" + s);
            restResponseResult.setStatus("1");
            restResponseResult.setStatusInfo(e.getMessage() + "RPC:返回" + s);
            return restResponseResult;
        }
        return restResponseResult;
    }
    /**
     * 院方_检查/检验报告单推送---数据说明
     * localhost:8890/gateway/transfer?api=patientInformationPush&param={CardType:"",CardNo:"000021341249",ReportType:"0",ReportId:"201405228-A-110B",State:"2",HospitalId:"1026333"}&requestId="目前没用随便写"
     */
    @RequestMapping(value = "/patientInformation", method = RequestMethod.POST)
    @ApiOperation(value = "检查/检验报告单推送-", response = Object.class, produces = "application/json", notes = "检查/检验报告单推送-")
    public RestResponseResult patientInformation(@ApiParam(value = "卡类型", required = true) @RequestParam(value = "CardType") String CardType,
                                                 @ApiParam(value = "卡号", required = true) @RequestParam(value = "CardNo") String CardNo,
                                                 @ApiParam(value = "报告单类型1检验报告2检查报告", required = true) @RequestParam(value = "ReportType") String ReportType,
                                                 @ApiParam(value = "报告单号", required = true) @RequestParam(value = "ReportId") String ReportId,
                                                 @ApiParam(value = "报告单状态1 报告未出 2报告已出", required = true) @RequestParam(value = "State") String State,
                                                 @ApiParam(value = "医院ID", required = true) @RequestParam(value = "HospitalId") String HospitalId,
                                                 HttpServletRequest request) {
        RestResponseResult restResponseResult = new RestResponseResult();
    public SQLResponResult patientInformation(@ApiParam(value = "卡类型", required = true) @RequestParam(value = "CardType") String CardType,
                                              @ApiParam(value = "卡号", required = true) @RequestParam(value = "CardNo") String CardNo,
                                              @ApiParam(value = "报告单类型1检验报告2检查报告", required = true) @RequestParam(value = "ReportType") String ReportType,
                                              @ApiParam(value = "报告单号", required = true) @RequestParam(value = "ReportId") String ReportId,
                                              @ApiParam(value = "报告单状态1 报告未出 2报告已出", required = true) @RequestParam(value = "State") String State,
                                              @ApiParam(value = "医院ID", required = true) @RequestParam(value = "HospitalId") String HospitalId,
                                              HttpServletRequest request) {
        SQLResponResult restResponseResult = new SQLResponResult();
        Object s = null;
        try {
            isEmpty(CardType, "CardType is null");
            isEmpty(CardNo, "CardNo is null");
            isEmpty(ReportType, "ReportType is null");
            isEmpty(ReportId, "ReportId is null");
            isEmpty(State, "State is null");
            isEmpty(HospitalId, "HospitalId is null");
            if ("1".equals(State)) {
                throw new Exception("报告未出，结束");
            }
@@ -158,24 +177,26 @@ public class QLCController {
                        Map<String, Object> params = new HashMap<String, Object>();
                        params.put("dataset", "HDSD01_01");
                        params.put("data", objData.toString());
                        httpClientUtil.doPost(Config.monogoUrl, params, null, null);
                        String monogoUrl = httpClientUtil.doPost(Config.monogoUrl, params, null, null);
                        monogoUrlValid(monogoUrl);
                        //出發採集上傳
                        params = new HashMap<String, Object>();
                        params.put("orgCode", HospitalId);
                        params.put("cardNo", CardNo);
                        params.put("eventNo", StringUtils.isEmpty(objData.get("ClinicNo")) ? objData.get("HosUserNo") : objData.get("ClinicNo"));
                        httpClientUtil.doPost(Config.startCollect, params, null, null);
                        String startCollect = httpClientUtil.doPost(Config.startCollect, params, null, null);
                        monogoUrlValid(startCollect);
                    }
                } else {
                    throw new Exception("RPC返回数据格式不合法：" + dataXml.getText());
                }
            } else {
                throw new Exception("RPC返回RespCode：" + root.element("RespCode").getText());
                throw new Exception(s.toString());
            }
        } catch (Exception e) {
            restResponseResult.setResponseCode("20000");
            restResponseResult.setResponseMessage(e.getMessage() + "RPC:返回" + s);
            restResponseResult.setStatus("2");
            restResponseResult.setStatusInfo(e.getMessage() + "RPC:返回" + s);
            return restResponseResult;
        }
        return restResponseResult;
@@ -237,4 +258,25 @@ public class QLCController {
        return obj;
    }
    /**
     * 判断是否为空
     *
     * @param EventType
     * @param message
     * @throws Exception
     */
    private void isEmpty(String EventType, String message) throws Exception {
        if (StringUtils.isEmpty(EventType)) {
            throw new Exception(message);
        }
    }
    private boolean monogoUrlValid(String monogoUrl) throws Exception {
        JSONObject jo = JSONObject.fromObject(monogoUrl);
        if ("true".equals(jo.get("successFlg"))) {
            return true;
        } else {
            throw new Exception(jo.get("message").toString());
        }
    }
}

Hos-Resource-Rest/src/main/java/com/yihu/hos/resource/base/App.java

@@ -2,8 +2,10 @@ package com.yihu.hos.resource.base;
import com.coreframework.remoting.Server;
import com.yihu.hos.config.Config;
import com.yihu.hos.filter.CharFilter;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.context.embedded.FilterRegistrationBean;
import org.springframework.boot.context.embedded.MultipartConfigFactory;
import org.springframework.boot.orm.jpa.EntityScan;
import org.springframework.context.annotation.Bean;
@@ -11,7 +13,10 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.util.StringUtils;
import org.springframework.web.filter.CharacterEncodingFilter;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import javax.servlet.Filter;
import javax.servlet.MultipartConfigElement;
import java.io.FileOutputStream;
import java.io.InputStream;
@@ -30,7 +35,7 @@ import java.util.Set;
@EnableAspectJAutoProxy(proxyTargetClass = true)
@ComponentScan("com.yihu.hos")
@EntityScan("com.yihu.hos.**.model")
public class App {
public class App extends WebMvcConfigurerAdapter {
    private static Properties prop = new Properties();
    //@RequestMapping("/")
@@ -57,6 +62,7 @@ public class App {
        app.setWebEnvironment(true);
        app.setShowBanner(false);
        Set<Object> set = new HashSet<Object>();
        //set.add("classpath:applicationContext.xml");  
        app.setSources(set);
@@ -93,6 +99,7 @@ public class App {
        // server.start();
    }
    /**
     * spring boot 定时任务
     */
@@ -100,5 +107,14 @@ public class App {
    // public void reportCurrentTime() {
    //System.out.println("抽取数据");
    // }
    // 用于处理编码问题
    @Bean
    public FilterRegistrationBean filterRegistrationBean(CharFilter filter) {
        FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean();
        filterRegistrationBean.setFilter(filter);
        filterRegistrationBean.setEnabled(true);
        filterRegistrationBean.addUrlPatterns("/*");
        return filterRegistrationBean;
    }
}

Hos-Resource-Rest/src/main/java/com/yihu/hos/resource/viewModel/SQLResponResult.java

@@ -0,0 +1,37 @@
package com.yihu.hos.resource.viewModel;
/**
 * Created by Administrator on 2016/4/25.
 */
public class SQLResponResult {
    /**
     * 0：接口数据请求正常
     * ≠0：接口响应数据异常
     */
    private String status = "0";
    /**
     * 当出错的时候，返回出错的说明，如下：
     * {
     * "status": 1,
     * "statusInfo": "传入参数错误",
     * "data": []
     * }
     */
    private String statusInfo;
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    public String getStatusInfo() {
        return statusInfo;
    }
    public void setStatusInfo(String statusInfo) {
        this.statusInfo = statusInfo;
    }
}

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',