Merge branch 'dev' of huangwenjie/patient-co-management into dev

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/prescription/PrescriptionProCAServiceImp.java

@@ -46,23 +46,23 @@ public class PrescriptionProCAServiceImp extends ZysoftBaseService implements Pr
    private String getHeaderXml(String api,String srcBusinessStreamNO,String srcRequestStreamNO)
    {
        return "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
            "<root>\n" +
            "   <serverName>"+api+"</serverName>\n" +
            "   <format>xml</format>\n" +
            "   <callOperator></callOperator>\n" +
            "   <certificate></certificate>\n" +
            "   <srcIP>10.95.22.10</srcIP >\n" +
            "   <srcUserMac>00:50:56:85:39:82</srcUserMac>\n" +
            "   <srcSystemCode>1</srcSystemCode>\n" +
            "   <srcSystemName>厦门i健康</srcSystemName>\n" +
            "   <srcBusinessNodeCode>node01</srcBusinessNodeCode>\n" +
            "   <srcBusinessNodeName>审核</srcBusinessNodeName>\n" +
            "   <srcOperatorAccount>"+srcBusinessStreamNO+"</srcOperatorAccount>\n" +
            "   <srcBusinessStreamNO>"+srcBusinessStreamNO+"</srcBusinessStreamNO>\n" +
            "   <srcRequestStreamNO>"+srcRequestStreamNO+"</srcRequestStreamNO>\n" +
            "   <srcDataExtProperty></srcDataExtProperty>\n" +
        return "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
            "<root>" +
            "   <serverName>"+api+"</serverName>" +
            "   <format>xml</format>" +
            "   <callOperator></callOperator>" +
            "   <certificate></certificate>" +
            "   <srcIP>10.95.22.10</srcIP >" +
            "   <srcUserMac>00:50:56:85:39:82</srcUserMac>" +
            "   <srcSystemCode>1</srcSystemCode>" +
            "   <srcSystemName>厦门i健康</srcSystemName>" +
            "   <srcBusinessNodeCode>node01</srcBusinessNodeCode>" +
            "   <srcBusinessNodeName>审核</srcBusinessNodeName>" +
            "   <srcOperatorAccount>"+srcBusinessStreamNO+"</srcOperatorAccount>" +
            "   <srcBusinessStreamNO>"+srcBusinessStreamNO+"</srcBusinessStreamNO>" +
            "   <srcRequestStreamNO>"+srcRequestStreamNO+"</srcRequestStreamNO>" +
            "   <srcDataExtProperty></srcDataExtProperty>" +
            "</root>";
    }
@@ -77,13 +77,12 @@ public class PrescriptionProCAServiceImp extends ZysoftBaseService implements Pr
    private String postZyCaServer(String api, Map<String,String> params,String srcBusinessStreamNO,String content) throws Exception{
        String msgBody = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
                "<root>\n";
        String msgBody = "<?xml version=\"1.0\" encoding=\"utf-8\"?><root>";
        if(params!=null && params.size()>0)
        {
            for(String key : params.keySet())
            {
                msgBody += "    <"+key+">"+params.get(key)+"</"+key+">\n";
                msgBody += "    <"+key+">"+params.get(key)+"</"+key+">";
            }
        }
        msgBody += "</root>";
@@ -126,6 +125,7 @@ public class PrescriptionProCAServiceImp extends ZysoftBaseService implements Pr
            StringWriter sw = new StringWriter();
            PrintWriter pw = new PrintWriter(sw);
            ex.printStackTrace(pw);
            ex.printStackTrace();
            System.out.println("error1:"+ex.getMessage());
            error = sw.toString();
            System.out.println("error2:"+error);