| 
					
				 | 
			
			
				@ -226,7 +226,20 @@ public class EntranceService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            resp = MqSdkUtil.putReqAndGetRespByQueryStr(sbs.toString(), fid); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            resp = MqSdkUtil.xml2jsonArrayRootRow(resp); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        return ConvertUtil.convertListEnvelopByString(resp); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        //剔除非激活的卡 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        JSONArray res = ConvertUtil.convertListEnvelopByString(resp); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if(res!=null&&res.size()>0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            Iterator it = res.iterator(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            if(it.hasNext()){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                JSONObject rs = (JSONObject) it.next(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                String stat = rs.getString("CARD_STAT"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                if(!"激活".equals(stat)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    it.remove(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        return res; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    /** 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -387,7 +400,7 @@ public class EntranceService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            //查询信息结束 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            sbs.append("<startNum>1</startNum></MsgInfo></ESBEntry>"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            resp = MqSdkUtil.putReqAndGetRespByQueryStr(sbs.toString(), fid); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            logger.info("resp "+resp); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				//            logger.info("resp "+resp); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            resp = MqSdkUtil.xml2jsonArrayRootRow(resp); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -453,6 +466,7 @@ public class EntranceService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        //发药时间 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String dispDate = null != jsonObjectBody.get("DISP_DATE") ? jsonObjectBody.get("DISP_DATE").toString() : ""; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if(StringUtils.isNotBlank(dispDate)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            //根据处方号获取处方 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            WlyyPrescriptionDO wlyyPrescriptionDO=prescriptionDao.findByRealOrder(realOrder); 
			 |