Merge branch 'master' of chenweida/esb into master

Hos-Resource-Rest/src/main/java/com/yihu/hos/config/Config.java

@@ -15,5 +15,5 @@ public class Config {
    public static String monogoUrl;
    public static String startCollect;
    public static String port;
    public static String channelId;
    public static String channelId="100123";
}

Hos-Resource-Rest/src/main/java/com/yihu/hos/gateway/control/rpc/impl/ResourceRpcImpl.java

@@ -112,7 +112,7 @@ public class ResourceRpcImpl implements IResourceRpc {
                "\"V\"=\"3.0.0\"," +
                "\"OutType\"=0n ," +
                "\"HospitalId\"=\""+hospitalId+"\"}";
        Object s = RPCUtil.getRPCData("ZEUS.HosHOPWs.QueryUserInfo", apiparam);
        Object s = RPCUtil.getRPCData("user.UserApi.QueryUserInfo\n", apiparam);
        //解析xml
        SAXReader saxReader = new SAXReader();
        Document document = saxReader.read(s.toString());
@@ -149,7 +149,7 @@ public class ResourceRpcImpl implements IResourceRpc {
    private void pushreport(String reportType, String reportId, String cardNo, String cardType, String hospitalId) throws Exception {
        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
        String data =
                "<Req><TransactionCode>5001</TransactionCode><Data><ReportId>" + reportId + "</ReportId><ReportType>" + reportType + "</ReportType></Data></Req>";
                "<Req><TransactionCode>5001</TransactionCode><Data><CardNo>"+cardNo+"</CardNo><ReportId>" + reportId + "</ReportId><ReportType>" + reportType + "</ReportType></Data></Req>";
        String apiparam = "{\"ChannelId\"=\"\"+Config.channelId+\"\"," +
                "\"ParamType\"=1," +
                "\"Params\"=\"" + data + "\"," +

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

@@ -87,8 +87,8 @@ public class RPCUtil {
        // TODO Auto-generated method stub
        String apiName = "ZEUS.HosHOPWs.GetReportInfo";
        apiName = "ZEUS.HosHOPWs.GetReportInfo";
        String param = "<Req><TransactionCode>5001</TransactionCode><Data><ReportId>201405228-A-110B</ReportId><ReportType>0</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 + "\"," +

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

@@ -3,5 +3,5 @@ rpc.appId=EsbCloud
rpc.channelId=100123
rpc.port=8081
http.monogourl=http://localhost:8080/datapush/datapush
http.startCollect=http://localhost:8080/crawler/patient
http.monogourl=http://localhost:8181/datapush/datapush
http.startCollect=http://localhost:8181/crawler/patient

Hos-resource/src/main/java/com/yihu/ehr/common/ApplicationStart.java

@@ -23,7 +23,7 @@ public class ApplicationStart implements ServletContextListener {
        //使用自定义转化器转化时间格式
        ConvertUtils.register(new DateConvert(), Date.class);
        initQuartz();//启动任务
        //initQuartz();//启动任务
    }
    @Override

Hos-resource/src/main/java/com/yihu/ehr/standard/model/adapter/AdapterSchemeDispatchModel.java

@@ -10,8 +10,7 @@ import java.util.Date;
 *
 * @Created by lingfeng 2015/12/23.
 */
@Entity
@Table(name = "adapter_scheme_dispatch")
@Entity(name = "adapter_scheme_dispatch")
public class AdapterSchemeDispatchModel {
    @Id
    @GeneratedValue(generator = "generator")

Hos-resource/src/main/java/com/yihu/ehr/standard/model/adapter/AdapterSchemeModel.java

@@ -9,8 +9,7 @@ import javax.persistence.*;
 *
 * @Created by lingfeng 2015/12/23.
 */
@Entity
@Table(name = "adapter_scheme")
@Entity(name="adapter_scheme")
public class AdapterSchemeModel {
    public static final String TABLE_NAME = "ADAPTER_SCHEME";
    @Id

Hos-resource/src/main/java/com/yihu/ehr/standard/model/adapter/AdapterSchemeVersionModel.java

@@ -10,8 +10,7 @@ import java.util.Date;
 *
 * @created lingfeng 2015/12/23.
 */
@Entity
@Table(name = "adapter_scheme_version")
@Entity(name = "adapter_scheme_version")
public class AdapterSchemeVersionModel {
    @Id
    @GeneratedValue(generator = "generator")

Hos-resource/src/main/java/com/yihu/ehr/standard/model/standard/StandardModel.java

@@ -10,8 +10,7 @@ import java.io.Serializable;
 *
 * @created Airhead 2015/12/23.
 */
@Entity
@Table(name = "std_info")
@Entity(name = "std_info")
public class StandardModel  implements Serializable {
    public static final String TABLE_NAME = "STD_INFO";

Hos-resource/src/main/java/com/yihu/ehr/standard/model/standard/StandardVersionModel.java

@@ -11,8 +11,7 @@ import java.util.Date;
 *
 * @created Airhead 2015/12/23.
 */
@Entity
@Table(name = "std_version")
@Entity(name = "std_version")
public class StandardVersionModel implements Serializable {
    public static final String TABLE_NAME = "STD_VERSION";

Hos-resource/src/main/java/com/yihu/ehr/standard/model/standard/StdCDACatalogModel.java

@@ -9,8 +9,7 @@ import javax.persistence.*;
 *
 * @created Airhead 2015/12/23.
 */
@Entity
@Table(name = "std_cda_catalog")
@Entity(name = "std_cda_catalog")
public class StdCDACatalogModel {
    public static String TABLE_NAME="STD_CDA_CATALOG";
    @Id

Hos-resource/src/main/java/com/yihu/ehr/standard/model/standard/StdDatasetCatalogModel.java

@@ -12,8 +12,7 @@ import javax.persistence.Table;
 *
 * @created Airhead 2015/12/23.
 */
@Entity
@Table(name = "std_dataset_catalog")
@Entity(name = "std_dataset_catalog")
public class StdDatasetCatalogModel {
    public static String TABLE_NAME = "STD_DATASET_CATALOG";

Hos-resource/src/main/java/com/yihu/ehr/system/controller/BaseDictController.java

@@ -1,12 +1,8 @@
package com.yihu.ehr.system.controller;
import com.yihu.ehr.common.Services;
import com.yihu.ehr.framework.model.ActionResult;
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.util.controller.BaseController;
import com.yihu.ehr.framework.util.http.HttpClientUtil;
import com.yihu.ehr.system.model.SystemDict;
import com.yihu.ehr.system.model.SystemDictList;
import com.yihu.ehr.system.service.intf.IBaseDictManager;