| 
					
				 | 
			
			
				@ -61,6 +61,7 @@ public class RemindDoctorService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            String age=""; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            String date = ""; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            String title = ""; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            int i = 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            for (WlyyOutpatientDO wlyyOutpatientDO : list) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                Long lastRemindTime=wlyyOutpatientDO.getLastRemindTime()==null?wlyyOutpatientDO.getCreateTime().getTime():wlyyOutpatientDO.getLastRemindTime().getTime(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                Long nowTime = new Date().getTime(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -72,36 +73,36 @@ public class RemindDoctorService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    Long minusts = TimeUnit.MILLISECONDS.toMinutes(nowTime - createTime); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    SystemMessageDO systemMessageDO = new SystemMessageDO(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    if ("2".equals(wlyyOutpatientDO.getOutpatientType())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        systemMessageDO.setTitle("协同门诊消息提醒"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        systemMessageDO.setTitle("协同门诊接诊消息提醒"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        systemMessageDO.setType("63"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    } else if ("3".equals(wlyyOutpatientDO.getOutpatientType())) {//专家咨询 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        //1.图文 2.视频 3家医 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        if ("1".equals(wlyyOutpatientDO.getType())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            systemMessageDO.setTitle("图文咨询消息提醒"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            systemMessageDO.setTitle("图文咨询接诊消息提醒"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            systemMessageDO.setType("68"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            title = "图文咨询消息提醒"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            msg = wlyyOutpatientDO.getPatientName()+"("+sex+" "+age+"岁)向您发起了图文咨询,已等待"+minusts+"分钟。点击接诊"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        } else if ("3".equals(wlyyOutpatientDO.getType())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            systemMessageDO.setTitle("家医咨询消息提醒"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            systemMessageDO.setTitle("家医咨询接诊消息提醒"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            systemMessageDO.setType("65"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            systemMessageDO.setTitle("视频咨询消息提醒"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            systemMessageDO.setTitle("视频咨询接诊消息提醒"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            systemMessageDO.setType("67"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            title = "视频咨询消息提醒"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            title = "视频咨询接诊消息提醒"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            date = DateUtil.dateToStrLong(wlyyOutpatientDO.getRegisterDate()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            msg = wlyyOutpatientDO.getPatientName()+"("+sex+" "+age+"岁)预约了"+date+"的视频咨询,点击查看"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    } else if ("1".equals(wlyyOutpatientDO.getOutpatientType())) {//在线复诊 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        //1.图文 2.视频 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        if ("1".equals(wlyyOutpatientDO.getType())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            systemMessageDO.setTitle("图文复诊消息提醒"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            systemMessageDO.setTitle("图文复诊接诊消息提醒"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            systemMessageDO.setType("61"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            title = "图文复诊消息提醒"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            title = "图文复诊接诊消息提醒"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            msg = wlyyOutpatientDO.getPatientName()+"("+sex+" "+age+"岁)向您发起了图文复诊,已等待"+minusts+"分钟。点击接诊"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            systemMessageDO.setTitle("视频复诊消息提醒"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            systemMessageDO.setTitle("视频复诊接诊消息提醒"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            systemMessageDO.setType("62"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            title = "视频复诊消息提醒"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            title = "视频复诊接诊消息提醒"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            date = DateUtil.dateToStrLong(wlyyOutpatientDO.getRegisterDate()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            msg = wlyyOutpatientDO.getPatientName()+"("+sex+" "+age+"岁)预约了"+date+"的视频复诊,点击查看"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -122,7 +123,7 @@ public class RemindDoctorService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    systemMessageDO.setRelationCode(wlyyOutpatientDO.getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    systemMessageDO.setIsRead("0"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    systemMessageDO.setDel("1"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    systemMessageDO.setCreateTime(new Date()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    systemMessageDO.setCreateTime(new Date(nowTime+i*1000)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    systemMessageDao.save(systemMessageDO); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    //系统消息结束===开始发送企业模板消息 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    if (wechatId.equalsIgnoreCase("xm_zsyy_wx")){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -145,6 +146,7 @@ public class RemindDoctorService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    if ("xm_ykyy_wx".equalsIgnoreCase(wechatId)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        prescriptionService.wxTempalteJPush("remind_doctor_pickup",wlyyOutpatientDO,null,"","","",""); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    i++; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            } 
			 |