Merge branch 'master' of chenweida/esb into master

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

@@ -84,7 +84,7 @@ public class QLCController {
            String respCode=root.element("RespCode").getText();
            if ("10000".equals(respCode)) {
                //xml轉json
                JSONObject obj =JSONObject.fromObject(XML2Json(root.asXML()));
               // JSONObject obj =JSONObject.fromObject(XML2Json(root.asXML()));
               // obj.put("CardType", CardType);
               // obj.put("CardNo", CardNo);
               // obj.put("PatientId", CardNo);
@@ -93,7 +93,7 @@ public class QLCController {
                //調用接口存入mongo
                Map<String, Object> params = new HashMap<String, Object>();
                params.put("dataset", "HDSA00_01");
                params.put("data", obj.toString());
                params.put("data", XML2Json(root.asXML()));
                params.put("orgCode", HospitalId);
                String monogoUrl = httpClientUtil.doPost(Config.monogoUrl, params, null, null);
                monogoUrlValid(monogoUrl,"mongo入库失败");
@@ -240,6 +240,7 @@ public class QLCController {
        }catch (Exception e){
            throw new Exception("返回的xml转JSON错误");
        }
        System.out.println(object.toString());
        return object.toString();
    }

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

@@ -29,9 +29,9 @@ public class DatacollectDao extends SQLGeneralDAO implements IDatacollectDao {
    public String getVersionByQLC(String orgCode) throws Exception
    {
        try{
            String sql = "select version from adapter_scheme_version v"+
                         "left join system_organization o on o.qlc_adapter_version=v.id"+
                         "where o.qlc_org_code ='"+orgCode+"'";
            String sql = "select version from adapter_scheme_version v "+
                         " left join system_organization o on o.qlc_adapter_version=v.id "+
                         " where o.qlc_org_code ='"+orgCode+"'";
            return super.scalarBySql(sql, String.class);
        }
        catch (Exception e)

Hos-resource/src/main/webapp/WEB-INF/web.xml

@@ -59,7 +59,7 @@
        </init-param>
        <init-param>
            <param-name>notCheckURLList</param-name>
            <param-value>/loginPage;/system/loginAction;/error;/datapush/datapush;/test.jsp</param-value>
            <param-value>/loginPage;/system/loginAction;/error;/datapush/datapush;/test.jsp;/crawler/patient</param-value>
        </init-param>
    </filter>
    <filter-mapping>