|  | @ -963,22 +963,22 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
 | 
	
		
			
				|  |  |         List<Map<String,Object>>  data = imService.doctorUpcomingList(doctorCode, type);
 | 
	
		
			
				|  |  |         if (data != null) {
 | 
	
		
			
				|  |  |             for (Map<String,Object> consult : data) {
 | 
	
		
			
				|  |  |                 Integer consultType =  Integer.parseInt(consult.get("type").toString());
 | 
	
		
			
				|  |  |                 if("1,15".equals(consultType)){//专家咨询
 | 
	
		
			
				|  |  |                 if("1,15".equals(type)){//专家咨询
 | 
	
		
			
				|  |  |                     Integer consultType =  Integer.parseInt(consult.get("type").toString());
 | 
	
		
			
				|  |  |                     if(1 == consultType){//专家咨询
 | 
	
		
			
				|  |  |                         consult.put("session_id", consult.get("patientId").toString()+"_"+ consult.get("doctorCode").toString()+"_1");
 | 
	
		
			
				|  |  |                     }else if(15 == consultType){//家医求助
 | 
	
		
			
				|  |  |                         consult.put("session_id", consult.get("patientId").toString()+"_"+ consult.get("generalDoctor").toString()+"_"+ consult.get("doctorCode").toString()+"_15");
 | 
	
		
			
				|  |  |                     }else{}
 | 
	
		
			
				|  |  |                 }else if("9".equals(consultType)){//图文复诊
 | 
	
		
			
				|  |  |                 }else if("9".equals(type)){//图文复诊
 | 
	
		
			
				|  |  |                     consult.put("session_id", consult.get("patientId")!=null?consult.get("patientId").toString():null+"_"+consult.get("outpatientid")!=null?consult.get("outpatientid").toString():null+"_9");
 | 
	
		
			
				|  |  |                     consult.put("type",consultType);
 | 
	
		
			
				|  |  |                 }else if("16".equals(consultType)){//视频复诊
 | 
	
		
			
				|  |  |                     consult.put("type",type);
 | 
	
		
			
				|  |  |                 }else if("16".equals(type)){//视频复诊
 | 
	
		
			
				|  |  |                     consult.put("session_id", consult.get("patientId")!=null?consult.get("patientId").toString():null+"_"+consult.get("outpatientid")!=null?consult.get("outpatientid").toString():null+"_16");
 | 
	
		
			
				|  |  |                     consult.put("type",consultType);
 | 
	
		
			
				|  |  |                     consult.put("type",type);
 | 
	
		
			
				|  |  |                 }else if("12".equals(type)){//协同门诊
 | 
	
		
			
				|  |  |                     consult.put("session_id", consult.get("patientId")!=null?consult.get("patientId").toString():null+"_"+consult.get("outpatientid")!=null?consult.get("outpatientid").toString():null+"_12");
 | 
	
		
			
				|  |  |                     consult.put("type",consultType);
 | 
	
		
			
				|  |  |                     consult.put("type",type);
 | 
	
		
			
				|  |  |                 }else{}
 | 
	
		
			
				|  |  |             
 | 
	
		
			
				|  |  |                 array.add(consult);
 |