|
@ -341,7 +341,7 @@ public class CustomerService extends BaseService{
|
|
|
sql +=" AND r.call_time <='"+endDate+" 23:59:59'";
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(userName)){
|
|
|
sql +=" AND r.user_name LIKE '%"+userName+" %'";
|
|
|
sql +=" AND r.user_name LIKE '%"+userName+"%'";
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(jobNo)){
|
|
|
User u = userDao.findByJobNo(jobNo);
|
|
@ -431,7 +431,7 @@ public class CustomerService extends BaseService{
|
|
|
callService.setCreateTime(new Date());
|
|
|
callServiceDao.save(callService);
|
|
|
//待处理发送消息给医生
|
|
|
sendCallServiceMes(callService,u);
|
|
|
sendCallServiceMes(callService);
|
|
|
//发送消息
|
|
|
sendWxMes(callService,u);
|
|
|
return "1";
|
|
@ -459,7 +459,7 @@ public class CustomerService extends BaseService{
|
|
|
callService.setUserName(u.getName());
|
|
|
callServiceDao.save(callService);
|
|
|
//待处理发送消息给医生
|
|
|
sendCallServiceMes(callService,u);
|
|
|
sendCallServiceMes(callService);
|
|
|
//发送消息
|
|
|
sendWxMes(callService,u);
|
|
|
return "1";
|
|
@ -468,16 +468,16 @@ public class CustomerService extends BaseService{
|
|
|
public void sendWxMes(CallService callService,User u){
|
|
|
Doctor d = doctorDao.findByCode(callService.getDoctor());
|
|
|
String mes = u.getName()+"(工号:"+u.getJobNo()+")代居民("+callService.getPatientName()+")发:" ;
|
|
|
if("1".equals(callService.getType())){
|
|
|
mes += u.getName()+"需要预约挂号";
|
|
|
if(callService.getType()==1){
|
|
|
mes += callService.getPatientName()+"需要预约挂号";
|
|
|
}else{
|
|
|
mes += u.getName()+"发起咨询";
|
|
|
mes += callService.getPatientName()+"发起咨询";
|
|
|
}
|
|
|
mes +="\n请您登录i健康app,进入协同服务管理进行查看处理。";
|
|
|
sendMsg(d,mes,"2");
|
|
|
}
|
|
|
|
|
|
public void sendCallServiceMes(CallService callService,User u){
|
|
|
public void sendCallServiceMes(CallService callService){
|
|
|
//待处理发送消息给医生
|
|
|
if(callService.getState()==1){
|
|
|
Patient p = patientDao.findByCode(callService.getPatient());
|
|
@ -485,10 +485,10 @@ public class CustomerService extends BaseService{
|
|
|
Message message = new Message();
|
|
|
message.setCzrq(new Date());
|
|
|
message.setCreateTime(new Date());
|
|
|
if("1".equals(callService.getType())){
|
|
|
message.setContent(u.getName()+"需要预约挂号");
|
|
|
if(callService.getType()==1){
|
|
|
message.setContent(callService.getPatientName()+"需要预约挂号");
|
|
|
}else{
|
|
|
message.setContent(u.getName()+"发起咨询");
|
|
|
message.setContent(callService.getPatientName()+"发起咨询");
|
|
|
}
|
|
|
|
|
|
message.setRead(1);//设置未读
|