Merge branch 'master' of chenweida/esb into master

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

@@ -95,8 +95,12 @@ public class RPCUtil {
        //		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.QueryUserInfo";
       // 		param = "<Req><TransactionCode>5003</TransactionCode><Data><CardType>1</CardType><CardNo>000021341249</CardNo><Mobile></Mobile><PatientId></PatientId></Data></Req>";
       apiName = "ZEUS.HosHOPWs.QueryRegInfo";
       param = "<Req><TransactionCode>5003</TransactionCode><Data><CardType>1</CardType><CardNo>6001</CardNo><IdCardNo>123123</IdCardNo><OrderId>订单号</OrderId><ClinicCard>就诊卡号</ClinicCard><TimeSlice>就诊时段</TimeSlice><StartTime>就诊日期开始</StartTime><EndTime>就诊日期结束</EndTime><RegFlag>1-预约 2-当天挂号</RegFlag></Data></Req>" ;
       // param = "<Req><TransactionCode>5003</TransactionCode><Data><StartTime>2016-04-08</StartTime></Data></Req>" ;
        //挂号事件推送
        //		apiName = "ZEUS.HosHOPWs.PushGuaHaoEvent";

Hos-Resource-WS/src/main/java/com.yihu.ehr/model/WSReturnModel.java

@@ -16,8 +16,8 @@ import java.util.Map;
 */
public class WSReturnModel {
    private String TransactionCode;
    private List<Map<String, Object>> Data=new ArrayList<Map<String, Object>>();
    private String RespCode="10000";
    private List<Map<String, Object>> Data = new ArrayList<Map<String, Object>>();
    private String RespCode = "10000";
    private String RespMessage = "成功";
    public String getTransactionCode() {
@@ -82,6 +82,7 @@ public class WSReturnModel {
                    }
                    dataElement.add(elemenData1Temp);
                } else {
                    // Element elemenTemp = DocumentHelper.createElement(toUpperCaseFirstOne(e.getKey()));
                    Element elemenTemp = DocumentHelper.createElement(toUpperCaseFirstOne(e.getKey()));
                    if (!StringUtils.isEmpty(e.getValue())) {
                        elemenTemp.addText(e.getValue().toString());
@@ -92,6 +93,7 @@ public class WSReturnModel {
            rootElement.add(dataElement);
        }
        document.setRootElement(rootElement);
        System.out.println(document.asXML());
        return document.asXML();
    }
@@ -106,9 +108,31 @@ public class WSReturnModel {
        }
        StringBuffer a = new StringBuffer();
        a.append(ch);
        return a.toString();
        return underlineToCamel(a.toString());
    }
    public static String underlineToCamel(String param) {
        if (param == null || "".equals(param.trim())) {
            return "";
        }
        int len = param.length();
        StringBuilder sb = new StringBuilder(len);
        for (int i = 0; i < len; i++) {
            char c = param.charAt(i);
            if (c=='_') {
                if (++i < len) {
                    sb.append(Character.toUpperCase(param.charAt(i)));
                }
            } else {
                sb.append(c);
            }
        }
        return sb.toString();
    }
    public static void main(String[] args) {
        System.out.println(underlineToCamel("asd_a"));
    }
    public String getRespCode() {
        return RespCode;
    }

Hos-Resource-WS/src/main/java/com.yihu.ehr/ws/ExcuteService.java

@@ -90,7 +90,7 @@ public class ExcuteService {
     * @param startDate
     * @param endDate
     * @param mobile
     * @param reportType
     * @param reportType 1是检查 2是检验
     * @return
     */
    public String GetReportList(
@@ -105,26 +105,45 @@ public class ExcuteService {
        wsReturnModel.setTransactionCode(TransactionCode);
        try {
            initJDBC();
             StringBuffer sb = new StringBuffer("select * from HDSD01_01 where 1=1 ");
            if (!StringUtils.isEmpty(cardType)) {
                sb.append(" and HDSD00_05_026 < '" + cardType + "'");
             }
            if (!StringUtils.isEmpty(cardNo)) {
                sb.append(" and HDSD00_01_001 > '" + cardNo + "'");
            if ("2".equals(reportType)) {
                //检验
                StringBuffer sb = new StringBuffer("select * from HDSD02_01 where 1=1 ");
                if (!StringUtils.isEmpty(endDate)) {
                    sb.append(" and HDSD00_05_026 < '" + endDate + "'");
                }
                if (!StringUtils.isEmpty(startDate)) {
                    sb.append(" and HDSD00_01_001 > '" + startDate + "'");
                }
                if (!StringUtils.isEmpty(mobile)) {
                    sb.append(" and HDSD00_01_001 = '" + mobile + "'");
                }
                if (!StringUtils.isEmpty(cardNo)) {
                    sb.append(" and HDSD00_01_001 = '" + cardNo + "'");
                }
                if (!StringUtils.isEmpty(cardType)) {
                    sb.append(" and HDSD00_01_001 = '" + cardType + "'");
                }
                wsReturnModel.setData(jdbcTemplate.queryForList(sb.toString()));
            } else {
                //检查
                StringBuffer sb = new StringBuffer("select * from HDSD01_01 where 1=1 ");
                if (!StringUtils.isEmpty(endDate)) {
                    sb.append(" and HDSD00_05_026 < '" + endDate + "'");
                }
                if (!StringUtils.isEmpty(startDate)) {
                    sb.append(" and HDSD00_01_001 > '" + startDate + "'");
                }
                if (!StringUtils.isEmpty(mobile)) {
                    sb.append(" and HDSD00_01_001 = '" + mobile + "'");
                }
                if (!StringUtils.isEmpty(cardNo)) {
                    sb.append(" and HDSD00_01_001 = '" + cardNo + "'");
                }
                if (!StringUtils.isEmpty(cardType)) {
                    sb.append(" and HDSD00_01_001 = '" + cardType + "'");
                }
                wsReturnModel.setData(jdbcTemplate.queryForList(sb.toString()));
            }
            if (!StringUtils.isEmpty(startDate)) {
                sb.append(" and HDSD00_01_001 > '" + startDate + "'");
            }
            if (!StringUtils.isEmpty(endDate)) {
                sb.append(" and HDSD00_01_001 > '" + endDate + "'");
            }
            if (!StringUtils.isEmpty(mobile)) {
                sb.append(" and HDSD00_01_001 > '" + mobile + "'");
            }
            if (!StringUtils.isEmpty(reportType)) {
                sb.append(" and HDSD00_01_001 > '" + reportType + "'");
            }
            wsReturnModel.setData(jdbcTemplate.queryForList(sb.toString()));
            return WSReturnModel.toXml(wsReturnModel);
        } catch (Exception e) {
            wsReturnModel.setRespCode("-30000");
@@ -148,19 +167,41 @@ public class ExcuteService {
        WSReturnModel wsReturnModel = new WSReturnModel();
        wsReturnModel.setTransactionCode(TransactionCode);
        try {
            initJDBC();
            StringBuffer sb = new StringBuffer("select * from HDSD01_01 where 1=1 ");
            if (!StringUtil.isEmpty(TransactionCode)) {
                sb.append(" and HDSD00_05_026 < '" + TransactionCode + "'");
            }
            if (!StringUtil.isEmpty(reportId)) {
                sb.append(" and HDSD00_01_001 > '" + reportId + "'");
            }
            if (!StringUtil.isEmpty(reportType)) {
                sb.append(" and HDSD00_01_001 > '" + reportType + "'");
            if ("2".equals(reportType)) {
                //检验
                StringBuffer sb = new StringBuffer("select * from HDSD02_01 where 1=1 ");
                if (!StringUtils.isEmpty(reportId)) {
                    sb.append(" and JDSD02_01_01 = '" + reportId + "'");
                }
                List<Map<String, Object>> returnData = jdbcTemplate.queryForList(sb.toString());
                for (Map<String, Object> oneM : returnData) {
                    //检验-图片报告单
                    sb = new StringBuffer("select * from HDSD02_02 where 1=1 ");
                    if (!StringUtils.isEmpty(oneM.get("JDSD02_02_01"))) {
                        sb.append(" and JDSD02_02_01 = '" + reportId + "'");
                    }
                    oneM.put("Data_1", jdbcTemplate.queryForList(sb.toString()));
                }
                wsReturnModel.setData(returnData);
            } else {
                //检查
                StringBuffer sb = new StringBuffer("select * from HDSD01_01 where 1=1 ");
                if (!StringUtils.isEmpty(reportId)) {
                    sb.append(" and HDSD00_05_026 < '" + reportId + "'");
                }
                List<Map<String, Object>> returnData = jdbcTemplate.queryForList(sb.toString());
                //检查细表
                for (Map<String, Object> oneM : returnData) {
                    sb = new StringBuffer("select * from HDSD01_02 where 1=1 ");
                    if (!StringUtils.isEmpty(oneM.get("JDSD01_01_01"))) {
                        sb.append(" and JDSK01_02_01 = '" + reportId + "'");
                    }
                    oneM.put("Data_1", jdbcTemplate.queryForList(sb.toString()));
                }
                wsReturnModel.setData(returnData);
            }
            wsReturnModel.setData(jdbcTemplate.queryForList(sb.toString()));
            return WSReturnModel.toXml(wsReturnModel);
        } catch (Exception e) {
            wsReturnModel.setRespCode("-30000");
@@ -172,6 +213,7 @@ public class ExcuteService {
    /**
     * 人口学信息查询
     *
     * @param TransactionCode
     * @param CardType
     * @param CardNo
@@ -185,22 +227,15 @@ public class ExcuteService {
        try {
            initJDBC();
            //挂号信息
            StringBuffer sb = new StringBuffer("select * from HDSC01_02 where 1=1 ");
            if (!StringUtil.isEmpty(PatientId)) {
                sb.append(" and PATIENT_ID = '" + PatientId + "'");
            }
            List<Map<String, Object>> GHMap= jdbcTemplate.queryForList(sb.toString());
            //人口学信息
            sb = new StringBuffer("select * from HDSA00_01 where 1=1 ");
            StringBuffer sb = new StringBuffer("select * from PATIENT_INFO a where 1=1 ");
            if (!StringUtil.isEmpty(PatientId)) {
                sb.append(" and PATIENT_ID = '" + PatientId + "'");
                sb.append(" and a.Patient_Id = '" + PatientId + "'");
            }
            List<Map<String, Object>> RKXMap= jdbcTemplate.queryForList(sb.toString());
            List<Map<String, Object>> RKXMap = jdbcTemplate.queryForList(sb.toString());
            GHMap.addAll(RKXMap);
            System.out.println(GHMap);
            wsReturnModel.setData(GHMap);
            System.out.println("pkxMap="+RKXMap);
            wsReturnModel.setData(RKXMap);
            return WSReturnModel.toXml(wsReturnModel);
        } catch (Exception e) {
            wsReturnModel.setRespCode("-30000");
@@ -210,4 +245,28 @@ public class ExcuteService {
        }
    }
    public String QueryRegInfo(String TransactionCode, String CardType,String CardNo, String IdCardNo, String OrderId, String ClinicCard, String TimeSlice, String StartTime, String EndTime, String RegFlag) {
        WSReturnModel wsReturnModel = new WSReturnModel();
        wsReturnModel.setTransactionCode(TransactionCode);
        try {
            initJDBC();
            //预约信息查询
            StringBuffer sb = new StringBuffer("select * from REG_INFO a where 1=1 ");
            if (!StringUtil.isEmpty(CardNo)) {
                sb.append(" and a.CARD_NO = '" + CardNo + "'");
            }
            if (!StringUtil.isEmpty(CardType)) {
                sb.append(" and a.CARD_TYPE = '" + CardType + "'");
            }
            List<Map<String, Object>> RKXMap = jdbcTemplate.queryForList(sb.toString());
            wsReturnModel.setData(RKXMap);
            return WSReturnModel.toXml(wsReturnModel);
        } catch (Exception e) {
            wsReturnModel.setRespCode("-30000");
            wsReturnModel.setRespMessage(e.getMessage());
            e.printStackTrace();
            return WSReturnModel.toXml(wsReturnModel);
        }
    }
}

Hos-Resource-WS/src/main/java/com/yihu/wsgw/webservice/ServiceGateWay.java

@@ -70,7 +70,7 @@ public class ServiceGateWay implements ServiceGateWayPortType {
                    break;
                }
                case "report.ReportWs.GetReportInfo": {
                    Document document = DocumentHelper.parseText(param.toString());
                    Document document = DocumentHelper.parseText(param.trim());
                    Element root = document.getRootElement();
                    Element data = root.element("Data");
                    xml = excuteService.GetReportInfo(
@@ -80,8 +80,26 @@ public class ServiceGateWay implements ServiceGateWayPortType {
                    );
                    break;
                }
                case "yy.yygh.QueryRegInfo": {
                    Document document = DocumentHelper.parseText(param.trim());
                    Element root = document.getRootElement();
                    Element data = root.element("Data");
                    xml = excuteService.QueryRegInfo(
                            StringUtil.isEmpty(root.element("TransactionCode").getText()) ? "" : root.element("TransactionCode").getText(),
                            StringUtil.isEmpty(data.element("CardType").getText()) ? "" : data.element("CardType").getText(),
                            StringUtil.isEmpty(data.element("CardNo").getText()) ? "" : data.element("CardNo").getText(),
                            StringUtil.isEmpty(data.element("IdCardNo").getText()) ? "" : data.element("IdCardNo").getText(),
                            StringUtil.isEmpty(data.element("OrderId").getText()) ? "" : data.element("OrderId").getText(),
                            StringUtil.isEmpty(data.element("ClinicCard").getText()) ? "" : data.element("ClinicCard").getText(),
                            StringUtil.isEmpty(data.element("TimeSlice").getText()) ? "" : data.element("TimeSlice").getText(),
                            StringUtil.isEmpty(data.element("StartTime").getText()) ? "" : data.element("StartTime").getText(),
                            StringUtil.isEmpty(data.element("EndTime").getText()) ? "" : data.element("EndTime").getText(),
                            StringUtil.isEmpty(data.element("RegFlag").getText()) ? "" : data.element("RegFlag").getText()
                    );
                    break;
                }
                case "report.ReportWs.GetReportList": {
                    Document document = DocumentHelper.parseText(param.toString());
                    Document document = DocumentHelper.parseText(param.trim());
                    Element root = document.getRootElement();
                    Element data = root.element("Data");
                    xml = excuteService.GetReportList(

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

@@ -80,7 +80,7 @@ public class DatapushService implements IDatapushService {
        String msg = "";
        if(dataset!=null)
        {
            String datasetId = dataset.getStdDatasetId().toString();
            String datasetId = dataset.getAdapterDatasetId().toString();
            List<AdapterMetadataResultDetailModel> list = stdService.getDatacolByScheme(version,datasetId);
            if(list!=null && list.size()>0)
            {

Hos-resource/src/main/java/com/yihu/ehr/resource/service/impl/StdService.java

@@ -46,7 +46,6 @@ public class StdService implements IStdService {
    private AdapterSchemeVersionService adapterSchemeVersion;
    /**************************** 适配方案 **************************************************/
    /**
     * 获取适配方案列表
@@ -66,8 +65,8 @@ public class StdService implements IStdService {
    /**
     * 通过适配方案+应用数据集ID获取数据集列表
     */
    public List<AdapterDatasetModel> getDatasetByScheme(String schemeVersion,String adapterDatasetId) {
        Map<String,Object> map = new HashMap<String,Object>();
    public List<AdapterDatasetModel> getDatasetByScheme(String schemeVersion, String adapterDatasetId) {
        Map<String, Object> map = new HashMap<String, Object>();
        map.put("adapterDatasetId", adapterDatasetId);
        AdapterVersion version = new AdapterVersion(schemeVersion);
        return datasetService.getList(AdapterDatasetModel.class, version.getDataSetTableName(), net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
@@ -78,7 +77,7 @@ public class StdService implements IStdService {
     * 通过适配方案获取字段列表
     */
    public List<AdapterMetadataResultDetailModel> getDatacolByScheme(String schemeVersion, String datasetId) throws Exception {
        Map<String,Object> map = new HashMap<String,Object>();
        Map<String, Object> map = new HashMap<String, Object>();
        map.put("adapterDatasetId", datasetId);
        return metadataService.getInfoList(schemeVersion, net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
    }
@@ -87,7 +86,7 @@ public class StdService implements IStdService {
     * 通过适配方案获取字典列表
     */
    public List<AdapterDictEntryModel> getDictByScheme(String schemeVersion, String dictId) {
        Map<String,Object> map = new HashMap<String,Object>();
        Map<String, Object> map = new HashMap<String, Object>();
        map.put("stdDictId", dictId);
        AdapterVersion version = new AdapterVersion(schemeVersion);
        return dictentryService.getList(AdapterDictEntryModel.class, version.getDictEntryTableName(), net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
@@ -98,20 +97,18 @@ public class StdService implements IStdService {
     */
    public DictionaryResult getDictResultByVersion(String schemeVersion, String dictId) throws Exception {
        DictionaryResult re = new DictionaryResult();
        Map<String,Object> map = new HashMap<String,Object>();
        Map<String, Object> map = new HashMap<String, Object>();
        map.put("stdDictId", dictId);
        AdapterVersion version = new AdapterVersion(schemeVersion);
        List<AdapterDictEntryModel> dictentryList =  dictentryService.getList(AdapterDictEntryModel.class, version.getDictEntryTableName(), net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
        List<AdapterDictEntryModel> dictentryList = dictentryService.getList(AdapterDictEntryModel.class, version.getDictEntryTableName(), net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
        List<DictItem> list = new ArrayList<>();
        if(!CollectionUtil.isEmpty(dictentryList)) {
            for(AdapterDictEntryModel adapterDictEntryModel : dictentryList)
            {
        if (!CollectionUtil.isEmpty(dictentryList)) {
            for (AdapterDictEntryModel adapterDictEntryModel : dictentryList) {
                String code = adapterDictEntryModel.getAdapterEntryCode();
                if(code!=null)
                {
                    DictItem dict = new  DictItem();
                if (code != null) {
                    DictItem dict = new DictItem();
                    dict.setCode(code);
                    dict.setValue(adapterDictEntryModel.getAdapterEntryValue());
                    list.add(dict);
@@ -126,20 +123,18 @@ public class StdService implements IStdService {
    /**
     * 通过适配方案+标准数据集CODE获取数据集
     *
     * @return
     */
    public AdapterDatasetModel getDatasetByCode(String schemeVersion,String stdDatasetCode) throws Exception
    {
        Map<String,Object> map = new HashMap<String,Object>();
    public AdapterDatasetModel getDatasetByCode(String schemeVersion, String stdDatasetCode) throws Exception {
        Map<String, Object> map = new HashMap<String, Object>();
        map.put("stdDatasetCode", stdDatasetCode);
        AdapterVersion version = new AdapterVersion(schemeVersion);
        List<AdapterDatasetModel> list =  datasetService.getList(AdapterDatasetModel.class, version.getDataSetTableName(), net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
        List<AdapterDatasetModel> list = datasetService.getList(AdapterDatasetModel.class, version.getDataSetTableName(), net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
        if(list!=null&&list.size()>0)
        {
        if (list != null && list.size() > 0) {
            return list.get(0);
        }
        else{
        } else {
            return null;
        }
    }
@@ -154,6 +149,7 @@ public class StdService implements IStdService {
    /**
     * 根据数据集code得到数据元
     *
     * @param params
     * @return
     * @throws Exception
@@ -164,6 +160,7 @@ public class StdService implements IStdService {
    /**
     * 得到全部版本的数据元
     *
     * @return
     * @throws Exception
     */
@@ -175,4 +172,5 @@ public class StdService implements IStdService {
    public List datasetVersionListByName(String rsResourceImportDatasetDialogName) throws Exception {
        return stdDatasetService.datasetVersionListByName(rsResourceImportDatasetDialogName);
    }
}

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

@@ -242,8 +242,7 @@ public class AdapterMetadataService extends SQLGeneralDAO {
    }
    public List getInfoList(String adapterVersion, String condition, String order, Integer limit, Integer offset) throws Exception{
        AdapterVersion version = new AdapterVersion(adapterVersion);
        List<AdapterMetadataModel> metadataModelList = getList(AdapterMetadataModel.class, version.getMetaDataTableName(), condition, order, limit, offset);
        AdapterVersion version = new AdapterVersion(adapterVersion);        List<AdapterMetadataModel> metadataModelList = getList(AdapterMetadataModel.class, version.getMetaDataTableName(), condition, order, limit, offset);
        List<Integer> idList = new ArrayList<>();
        Map<Integer, StdMetaDataModel> stdMetaDataModelMap = new HashMap<>();
        Integer schemeId = null;