| 
					
				 | 
			
			
				@ -5862,6 +5862,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        List<Map<String, Object>> list = hibenateUtils.createSQLQuery(sql, params, page, pagesize); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        List<WlyyHospitalSysDictDO> doctorFrontList = wlyyHospitalSysDictDao.findByDictNameOrderBySort("doctorFrontList",orgCode); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        List<Map<String,Object>> frontDoctor = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if ("xm_ykyy_wx".equalsIgnoreCase(wechatId)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            sql= sql.replace("AS \"id\"",""); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String sqlCharge = "SELECT t.id as \"id\",\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\tm.req_fee as \"twfzFee\",\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\ta.req_fee as \"spfzFee\",\n" + 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -12339,7 +12342,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            jsonObject.put("type",32); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            jsonObject.put("id",prescriptionId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            jsonObject.put("outpatientId",wlyyOutpatientDO.getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        }else if("remind_doctor_pickup".equalsIgnoreCase(templateCode)){//物流消息提醒 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        }else if("remind_doctor_pickup".equalsIgnoreCase(templateCode)){//接诊下消息提醒 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            BaseJpushTemplateDO baseJpushTemplateDO = baseJpushTemplateDao.findByCode(templateCode); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            if(baseJpushTemplateDO!=null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                if ("1".equalsIgnoreCase(wlyyOutpatientDO.getOutpatientType())&&"1".equalsIgnoreCase(wlyyOutpatientDO.getType())){ 
			 |