Merge branch 'master' of http://192.168.1.220:10080/esb/esb

Hos-Framework/pom.xml

@@ -6,7 +6,7 @@
    <groupId>com.yihu.hos.resource</groupId>
    <artifactId>Hos-Framework</artifactId>
    <version>1.0.2</version>
    <version>1.0.5</version>
    <parent>
        <groupId>com.yihu.core</groupId>
        <artifactId>Hos-Framework-dependencies</artifactId>

Hos-Framework/src/main/java/com/yihu/ehr/framework/model/TreeResult.java

@@ -5,7 +5,7 @@ import java.io.Serializable;
/**
 * Created by chenweida on 2015/12/17.
 */
public class TreeResult extends Result implements Serializable {
public class TreeResult implements Serializable {
    String id;//节点IP
    String pid;//父节点IP
    String text;//显示的名字

Hos-Resource-Rest/resource-rest.iml

@@ -21,6 +21,7 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="Maven: com.yihu.core:core-rpc:2.0.0" level="project" />
    <orderEntry type="library" name="Maven: com.yihu.core:ehr-dbhelper:1.1.4" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.2.7.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.2.7.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.2.7.RELEASE" level="project" />
@@ -91,7 +92,7 @@
    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.2" level="project" />
    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.1.1.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.yihu.core:ehr-dbhelper:1.1.4" level="project" />
    <orderEntry type="library" name="Maven: com.yihu.core:ehr-dbhelper:1.1.8" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" />
@@ -154,6 +155,7 @@
    <orderEntry type="library" name="Maven: org.apache.axis2:org.apache.axis2.osgi:1.6.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.axis2:axis2-transport-http:1.6.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.axis2:axis2-transport-local:1.6.3" level="project" />
    <orderEntry type="library" name="Maven: org.json:json:20151123" level="project" />
  </component>
  <component name="org.twodividedbyzero.idea.findbugs">
    <option name="_basePreferences">

Hos-Resource-Rest/src/main/java/com/yihu/hos/gateway/util/RPCUtil.java

@@ -84,70 +84,47 @@ public class RPCUtil {
     *
     */
    public static void main(String[] args) {
        // TODO Auto-generated method stub
        String apiName = "ZEUS.HosHOPWs.GetReportInfo";
        String apiName="";
        String param="";
                //获取报告单列表
       // apiName = "ZEUS.HosHOPWs.GetReportList";
        //param = "<Req><TransactionCode>5001</TransactionCode><Data><CardType>1</CardType><CardNo>000021341249</CardNo><IdCardNo>352103197603094519</IdCardNo><StartDate>2016-01-01</StartDate><EndDate>2016-04-05</EndDate><Mobile>1885215394</Mobile><PatientName>周春生</PatientName><ReportType>1</ReportType></Data></Req>";
       // apiName = "ZEUS.HosHOPWs.QueryUserInfo";
        String param = "<Req><TransactionCode>5001</TransactionCode><Data><ReportId>201405228-A-110B</ReportId><ReportType>0</ReportType><CardNo>000021341249</CardNo></Data></Req>";
        String apiparam = "{\"ChannelId\"=\"" + Config.channelId + "\"," +
                "\"ParamType\"=1," +
                "\"Params\"=\"" + param + "\"," +
                "\"Guid\"=\"" + "00000001111111" + "\"," +
                "\"V\"=\"3.0.0\"," +
                "\"OutType\"=1," +
                "\"HospitalId\"=\"1026333\"}";
        String result = null;
        try {
            result = ServiceBus.getInstance(
                    "172.18.20.21:2181",
                    "EsbCloud").call(apiName, apiparam);
            System.out.println("返回的数据:" + result);
        } catch (Exception e) {
            // TODO Auto-generated catch block
            e.printStackTrace();
        }
        System.out.println("result=" + result);
    }
    /*
    public static void main(String[] args) {
        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
        String data =
                "<Req>" +
                        "<TransactionCode>yy.yygh.QueryNumbers</TransactionCode>" +
                        "<Data>" +
                        "<CardType>123</CardType>" +
                        "<CardNo>333</CardNo>" +
                        "<PatientId>333</PatientId>" +
                        "</Data>" +
                        "</Req>";
        String SERVER_URL = "http://service.yihu.com:8080/WSGW/services/ServiceGateWay";
        String namespace = "http://com.yihu.wsgw/ServiceGateWay";
        String methos = "service";
        Class[] classes = new Class[]{String.class, String.class, String.class, String.class, Integer.class, Integer.class, String.class};
        Object[] v = new Object[7];
        v[0] = "{ClientVersion:1,ClientId:'EsbCloud',Sign:'Sign',SessionKey:''}";//authInfo
        v[1] = sdf.format(new Date());//sequenceNo
        v[2] = "report.ReportWs.GetReportInfo";//api
        v[3] = data;
        v[4] = 1;//paramType(0: json  1: Xml)
        v[5] = 1;//outType(0: json  1: Xml)
        v[6] = "1.0";//API版本号
        Object s = RPCUtil.getRPCData( classes, v);
        try {
            //新建RPC服务客户端
            RPCServiceClient serviceClient = new RPCServiceClient();
            Options options = serviceClient.getOptions();
            //设置URL
            EndpointReference targetEPR = new EndpointReference(SERVER_URL);
            options.setTo(targetEPR);
            //设置参数的类型
            //设置namespace和方法名
            QName opAddEntry = new QName(namespace, methos);
            //数组的第一个值为返回值
            String xml = (String) (serviceClient.invokeBlocking(opAddEntry, v, classes))[0];
            System.out.println(xml);
        } catch (Exception e) {
            e.printStackTrace();
        //检查/检验报告单
        	//	apiName = "ZEUS.HosHOPWs.GetReportInfo";
        //		param = "<Req><TransactionCode>5002</TransactionCode><Data><ReportId>201405228-A-110B</ReportId><ReportType>0</ReportType><CardNo>000021341249</CardNo></Data></Req>";
        //查询病人信息
        		apiName = "ZEUS.HosHOPWs.QueryUserInfo";
        		param = "<Req><TransactionCode>5003</TransactionCode><Data><CardType>1</CardType><CardNo>000021341249</CardNo><Mobile></Mobile><PatientId></PatientId></Data></Req>";
        //挂号事件推送
        //		apiName = "ZEUS.HosHOPWs.PushGuaHaoEvent";
        //		param = "<Req><TransactionCode></TransactionCode><Data><EventType>事件类型:门诊、住院</EventType><EventNo>事件编码：门诊号、住院号</EventNo><CardType>证件类型</CardType><CardNo>证件号</CardNo><PatientId>病人id</PatientId></Data></Req>";
        //检查/检验报告单推送
        //		apiName = "ZEUS.HosHOPWs.PushReport";
        //		param = "<Req><TransactionCode></TransactionCode><Data><CardType>卡类型</CardType><CardNo>卡号</CardNo><ReportType>报告单类型</ReportType><ReportId>报告单号</ReportId></Data></Req>";
        //		apiName = "ZEUS.HosHOPWs.QueryHospital";
        //		param = "<Req><TransactionCode></TransactionCode><Data><HosId>944</HosId></Data></Req>";
            String apiparam = "{\"ChannelId\"=\"100123\"," + "\"ParamType\"=1,"
                    + "\"Params\"=\"" + param + "\"," + "\"Guid\"=\""
                    + "00000001111111" + "\"," + "\"V\"=\"3.0.0\","
                    + "\"OutType\"=1," + "\"HospitalId\"=\"1026333\"}";
            String result = null;
            try {
                result = ServiceBus.getInstance(
                        "172.18.20.21:2181",
                       "EsbCloud")
                        .call(apiName, apiparam);
            } catch (Exception e) {
                // TODO Auto-generated catch block
                e.printStackTrace();
            }
            System.out.println("result=" + result);
        }
    }*/
}

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

@@ -45,7 +45,7 @@ public class QLCController {
    /**
     * 院方_挂号事件推送
     * localhost:8890/gateway/transfer?api=registeredPush&param={EventType:"",EventNo:"",CardType:"",CardNo:"",PatientId:"",HospitalId:""}&requestId="目前没用随便写"
     * localhost:8081/gateway/transfer?api=17&param={EventType:"1",EventNo:"1",CardType:"1",CardNo:"1",PatientId:"1",HospitalId:"1026333"}&requestId="目前没用随便写"
     */
    @RequestMapping(value = "/queryUserInfo", method = RequestMethod.POST)
    @ApiOperation(value = "挂号事件推送", response = Object.class, produces = "application/json", notes = "院方挂号事件推送")
@@ -66,13 +66,13 @@ public class QLCController {
            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 param = "<Req><TransactionCode>5003</TransactionCode><Data><CardType>"+CardType+"</CardType><CardNo>"+CardNo+"</CardNo><Mobile></Mobile><PatientId></PatientId></Data></Req>";
            String apiparam = "{\"ChannelId\"=\"" + Config.channelId + "\"," +
                    "\"ParamType\"=1," +
                    "\"Params\"=\"" + param + "\"," +
                    "\"Guid\"=\"" + "00000001111111" + "\"," +
                    "\"Guid\"=\"00000001111111\"," +
                    "\"V\"=\"3.0.0\"," +
                    "\"OutType\"=0n ," +
                    "\"OutType\"=1," +
                    "\"HospitalId\"=\"" + HospitalId + "\"}";
            s = RPCUtil.getRPCData("ZEUS.HosHOPWs.QueryUserInfo", apiparam);
            //解析xml
@@ -91,6 +91,7 @@ public class QLCController {
                Map<String, Object> params = new HashMap<String, Object>();
                params.put("dataset", "HDSA00_01");
                params.put("data", obj.toString());
                params.put("orgCode", HospitalId);
                String monogoUrl = httpClientUtil.doPost(Config.monogoUrl, params, null, null);
                monogoUrlValid(monogoUrl);
                //出發採集上傳
@@ -106,7 +107,7 @@ public class QLCController {
        } catch (Exception e) {
            restResponseResult.setStatus("1");
            restResponseResult.setStatusInfo(e.getMessage() + "RPC:返回" + s);
            restResponseResult.setStatusInfo(e.getMessage() + "       RPC:返回" + s);
            return restResponseResult;
        }
        return restResponseResult;

Hos-Resource-Rest/src/main/resources/rpc.properties

@@ -1,7 +1,7 @@
rpc.url=172.18.20.21:2181
rpc.appId=EsbCloud
rpc.channelId=100123
rpc.port=8182
rpc.port=2181
http.monogourl=http://localhost:8080/datapush/datapush
http.startCollect=http://localhost:8080/crawler/patient

Hos-resource/pom.xml

@@ -63,7 +63,7 @@
        <dependency>
            <groupId>com.yihu.hos.resource</groupId>
            <artifactId>Hos-Framework</artifactId>
            <version>1.0.2</version>
            <version>1.0.5</version>
        </dependency>
        <!--<dependency>-->
        <!--<groupId>com.yihu.ehr</groupId>-->

Hos-resource/src/main/java/com/yihu/ehr/datacollect/dao/DatacollectDao.java

@@ -31,7 +31,7 @@ public class DatacollectDao extends SQLGeneralDAO implements IDatacollectDao {
        try{
            String sql = "select IFNULL(o.qlc_adapter_version,'') \n" +
                    "from system_organization o\n" +
                    "where o.code = '"+orgCode+"'";
                    "where o.qlc_org_code = '"+orgCode+"'";
            return super.scalarBySql(sql, String.class);
        }
        catch (Exception e)

Hos-resource/src/main/java/com/yihu/ehr/datacollect/service/DatacollectService.java

@@ -354,20 +354,18 @@ public class DatacollectService implements IDatacollectService {
                }
                //增量采集
                String maxKey = "0";
                String keyValue = ds.getJobDatasetKeyvalue();
                if(key!=null && key.length()>0)
                {
                    maxKey = key;
                    if(keytype.toUpperCase().equals("DATE")) //时间类型
                    {
                        Date keyDate = new Date();
                        if(keyvalue!=null && keyvalue.length()>0) {
                            Date keyDate = new Date();
                            //字符串转时间
                            keyDate = DateConvert.toDate(keyvalue);
                            //根据数据库类型获取时间sql
                            strWhere += " and "+ key + ">'"+getDateSqlByDBType(dbType,keyDate)+"'";
                            strWhere += " order by "+ key;
                            strWhere += " and "+ maxKey + ">'"+getDateSqlByDBType(dbType,keyDate)+"'";
                        }
                    }
@@ -376,17 +374,16 @@ public class DatacollectService implements IDatacollectService {
                        maxKey = getToNumberSqlByDBType(dbType,key);
                        if(keyvalue!=null && keyvalue.length()>0) {
                            strWhere += " and "+ maxKey + ">'" + keyvalue + "'";
                            strWhere += " order by "+ maxKey;
                        }
                    }
                    else{
                        if(keyvalue!=null && keyvalue.length()>0) {
                            strWhere += " and "+ key + ">'" + keyvalue + "'";
                            strWhere += " order by "+ key;
                            strWhere += " and "+ maxKey + ">'" + keyvalue + "'";
                        }
                    }
                    strWhere += " order by " + maxKey;
                }
                strSql += strWhere;
                //总条数和最大值查询
                String sqlCount = "select count(1) as COUNT,max(" + maxKey + ") as MAX_KEYVALUE from " + adapterTableName + strWhere;

Hos-resource/src/main/java/com/yihu/ehr/datacollect/service/DatapushService.java

@@ -149,7 +149,7 @@ public class DatapushService implements IDatapushService {
        else{
            msg = "数据入库成功！（表："+datasetCode+"）";
            //日志记录
            datacollectLog.addDataPushLog("1","1",msg);
           // datacollectLog.addDataPushLog("1","1",msg);
            return ActionResult.success(msg);
        }
    }

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

@@ -3,6 +3,7 @@ package com.yihu.ehr.standard.controller;
import com.yihu.ehr.framework.model.DataGridResult;
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.service.adapter.AdapterSchemeVersionService;
import io.swagger.annotations.Api;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
@RestController("SchemeVersionController")
@RequestMapping("/adapterCenter")
@@ -103,6 +105,16 @@ public class SchemeVersionController extends BaseController {
        }
    }
    @RequestMapping("getVersionTree")
    @ResponseBody
    public List<TreeResult> getVersionTree() {
        try {
            return adapterSchemeVersion.getVersionTree();
        } catch (Exception ex) {
            return null;
        }
    }
    /**
     * 获取基础版本列表
     * @param schemeId

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/adapter/AdapterSchemeVersionService.java

@@ -475,5 +475,39 @@ public class AdapterSchemeVersionService extends SQLGeneralDAO {
        return data;
    }
    /**
     * 树型数据
     * @return
     * @throws Exception
     */
    public List<TreeResult> getVersionTree() throws Exception {
        String SchemeSql = "from AdapterSchemeModel";
        List<AdapterSchemeModel>std=(List<AdapterSchemeModel>)super.hibernateTemplate.find(SchemeSql);
        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);
            }
        }
        return results;
    }
}

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/resources/config/dbhelper.properties

@@ -1,5 +1,5 @@
defaultName = hos-mysql
defaultUri = mysql://172.19.103.71:3306/esb?useUnicode=true&characterEncoding=UTF-8
defaultUri = jdbc:mysql://172.19.103.71:3306/esb?useUnicode=true&characterEncoding=UTF-8
defaultUser = hos
defaultPassword = hos

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");
                }
              }}
            ]

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

@@ -76,7 +76,7 @@
    <div class="m-form-group">
        <label>全流程适配版本：</label>
        <div class="m-form-control">
            <input type="text" class="l-textbox" id="qlcAdapterVersion" name="qlcAdapterVersion"/>
            <input type="text" id="qlcAdapterVersion" name="qlcAdapterVersion"/>
        </div>
    </div>
    <!-- 隐藏字段 -->

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

@@ -19,8 +19,7 @@
                valueField: 'id',
                textField: 'text',
                tree: {
                    url:'/adapterCenter/getVersion',
                    //dataParmName: 'detailModelList',
                    url:'/adapterCenter/getVersionTree',
                    textFieldName:"text",
                    idFieldName:"id",
                    parentIDFieldName:"pid",

Hos-resource/src/main/webapp/develop/lib/ligerui/custom/ligerOverwrite.js

@@ -241,6 +241,23 @@
                return "";
            }
        },
        /****** 下拉树宽度BUG修复 add by hzp at 20160602***********************/
        bulidContent: function ()
        {
            var g = this, p = this.options;
            this.clearContent();
            if (g.select)
            {
                g.setSelect();
            }
            else if (p.tree)
            {
                /*******/
                p.tree.width=g.inputText.width();
                /*******/
                g.setTree(p.tree);
            }
        }
    });
@@ -506,7 +523,8 @@
        checkbox:false,
        parentIcon:false,
        childIcon:false,
        treeLine:false
        treeLine:false,
        nodeWidth:180
    });
    $.extend($.ligerui.controls.Tree.prototype, {
        _upadteTreeWidth: function ()