|  | @ -1707,25 +1707,25 @@ public class XzzxEntranceService{
 | 
	
		
			
				|  |  |             condition+="<emrtitle>"+jsonObject.getString("emrtitle")+"</emrtitle>";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         if (null!=jsonObject.get("catalogid")){
 | 
	
		
			
				|  |  |             condition = "<catalogid>"+jsonObject.getString("catalogid")+"</catalogid>";
 | 
	
		
			
				|  |  |             condition += "<catalogid>"+jsonObject.getString("catalogid")+"</catalogid>";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         if (null!=jsonObject.get("operatorname")){
 | 
	
		
			
				|  |  |             condition = "<operatorname>"+jsonObject.getString("operatorname")+"</operatorname>";
 | 
	
		
			
				|  |  |             condition += "<operatorname>"+jsonObject.getString("operatorname")+"</operatorname>";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         if (null!=jsonObject.get("operatorname")){
 | 
	
		
			
				|  |  |             condition = "<operatorname>"+jsonObject.getString("operatorname")+"</operatorname>";
 | 
	
		
			
				|  |  |             condition += "<operatorname>"+jsonObject.getString("operatorname")+"</operatorname>";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         if (null!=jsonObject.get("operatorid")){
 | 
	
		
			
				|  |  |             condition = "<operatorid>"+jsonObject.getString("operatorid")+"</operatorid>";
 | 
	
		
			
				|  |  |             condition += "<operatorid>"+jsonObject.getString("operatorid")+"</operatorid>";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         if (null!=jsonObject.get("operatorid")){
 | 
	
		
			
				|  |  |             condition = "<operatorid>"+jsonObject.getString("operatorid")+"</operatorid>";
 | 
	
		
			
				|  |  |             condition += "<operatorid>"+jsonObject.getString("operatorid")+"</operatorid>";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         if (null!=jsonObject.get("emrtype")){
 | 
	
		
			
				|  |  |             condition = "<emrtype>"+jsonObject.getString("emrtype")+"</emrtype>";
 | 
	
		
			
				|  |  |             condition += "<emrtype>"+jsonObject.getString("emrtype")+"</emrtype>";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         if (null!=jsonObject.get("id")){
 | 
	
		
			
				|  |  |             condition = "<id>"+jsonObject.getString("id")+"</id>";
 | 
	
		
			
				|  |  |             condition += "<id>"+jsonObject.getString("id")+"</id>";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         String msgBody ="<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
 | 
	
		
			
				|  |  |                 "<root>"+condition+"</root>";
 | 
	
	
		
			
				|  | @ -1733,12 +1733,10 @@ public class XzzxEntranceService{
 | 
	
		
			
				|  |  |         params.put("msgHeader",msgHeader);
 | 
	
		
			
				|  |  |         params.put("msgBody",msgBody);
 | 
	
		
			
				|  |  |         logger.info("returnEmrHtmlByHLW params:"+params.toString());
 | 
	
		
			
				|  |  |         String xml = getXzzxWebServiceInfo("CallInterface",params,getSelectUrl());
 | 
	
		
			
				|  |  |         XMLSerializer xmlSerializer = new XMLSerializer();
 | 
	
		
			
				|  |  |         String json = xmlSerializer.read(xml).toString();
 | 
	
		
			
				|  |  |         logger.info("returnEmrHtmlByHLW json:"+json);
 | 
	
		
			
				|  |  |         String xml = getXzzxWebServiceInfo("CallInterface",params,getOperateUrl());
 | 
	
		
			
				|  |  |         logger.info("returnEmrHtmlByHLW json:"+xml);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |         return json;
 | 
	
		
			
				|  |  |         return xml;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | //=====================微信模板消息推送===================================
 | 
	
		
			
				|  |  | 
 |