Merge branch 'master' of chenweida/esb into master

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

@@ -73,12 +73,15 @@ public class WSReturnModel {
                if ("data_1".equals(e.getKey().toLowerCase())) {
                    //判断是否是data1
                    Element elemenData1Temp = DocumentHelper.createElement("Data_1");
                    for (Map.Entry<String, Object> dataE : ((Map<String, Object>) e.getValue()).entrySet()) {
                        Element elemenData1TempElement = DocumentHelper.createElement(toUpperCaseFirstOne(dataE.getKey()));
                        if (!StringUtils.isEmpty(e.getValue())) {
                            elemenData1TempElement.addText(dataE.getValue().toString());
                    List<Map<String,Object>> list= (List<Map<String, Object>>) e.getValue();
                    for(Map<String,Object> one:list){
                        for (Map.Entry<String, Object> dataE : one.entrySet()) {
                            Element elemenData1TempElement = DocumentHelper.createElement(toUpperCaseFirstOne(dataE.getKey()));
                            if (!StringUtils.isEmpty(e.getValue())) {
                                elemenData1TempElement.addText(dataE.getValue().toString());
                            }
                            elemenData1Temp.add(elemenData1TempElement);
                        }
                        elemenData1Temp.add(elemenData1TempElement);
                    }
                    dataElement.add(elemenData1Temp);
                } else {
@@ -140,4 +143,14 @@ public class WSReturnModel {
    public void setRespCode(String respCode) {
        RespCode = respCode;
    }
    @Override
    public String toString() {
        return "WSReturnModel{" +
                "TransactionCode='" + TransactionCode + '\'' +
                ", Data=" + Data +
                ", RespCode='" + RespCode + '\'' +
                ", RespMessage='" + RespMessage + '\'' +
                '}';
    }
}

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

@@ -168,40 +168,41 @@ public class ExcuteService {
        wsReturnModel.setTransactionCode(TransactionCode);
        try {
            initJDBC();
            if ("2".equals(reportType)) {
            if ("1".equals(reportType)) {
                //检验
                StringBuffer sb = new StringBuffer("select * from HDSD02_01 where 1=1 ");
                StringBuffer sb = new StringBuffer("select * from REPORT_JY where 1=1 ");
                if (!StringUtils.isEmpty(reportId)) {
                    sb.append(" and JDSD02_01_01 = '" + reportId + "'");
                    sb.append(" and REPORT_ID = '" + 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 + "'");
                    sb = new StringBuffer("select * from REPORT_JY_MX where 1=1 ");
                    if (!StringUtils.isEmpty(oneM.get("REPORT_ID"))) {
                        sb.append(" and REPORT_ID = '" + reportId + "'");
                    }
                    oneM.put("Data_1", jdbcTemplate.queryForList(sb.toString()));
                }
                wsReturnModel.setData(returnData);
            } else {
                //检查
                StringBuffer sb = new StringBuffer("select * from HDSD01_01 where 1=1 ");
                StringBuffer sb = new StringBuffer("select * from REPORT where 1=1 ");
                if (!StringUtils.isEmpty(reportId)) {
                    sb.append(" and HDSD00_05_026 < '" + reportId + "'");
                    sb.append(" and REPORT_ID = '" + 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 + "'");
                    sb = new StringBuffer("select * from REPORT_JC where 1=1 ");
                    if (!StringUtils.isEmpty(oneM.get("REPORT_ID"))) {
                        sb.append(" and REPORT_ID = '" + reportId + "'");
                    }
                    oneM.put("Data_1", jdbcTemplate.queryForList(sb.toString()));
                }
                wsReturnModel.setData(returnData);
            }
            System.out.println(wsReturnModel);
            return WSReturnModel.toXml(wsReturnModel);
        } catch (Exception e) {
            wsReturnModel.setRespCode("-30000");
@@ -229,12 +230,13 @@ public class ExcuteService {
            initJDBC();
            //人口学信息
            StringBuffer sb = new StringBuffer("select * from PATIENT_INFO a where 1=1 ");
            if (!StringUtil.isEmpty(PatientId)) {
                sb.append(" and a.Patient_Id = '" + PatientId + "'");
            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());
            System.out.println("pkxMap="+RKXMap);
            wsReturnModel.setData(RKXMap);
            return WSReturnModel.toXml(wsReturnModel);
        } catch (Exception e) {