|
@ -307,8 +307,10 @@ public class TimeoutOverDueService {
|
|
sql = sql + "date_format(s.last_message_time,'%Y-%m-%d %H:%i:%S' ) AS \"lastMessageTime\",";
|
|
sql = sql + "date_format(s.last_message_time,'%Y-%m-%d %H:%i:%S' ) AS \"lastMessageTime\",";
|
|
}
|
|
}
|
|
sql = sql+ "\ts.last_sender_id as \"lastSenderId\",\n" +
|
|
sql = sql+ "\ts.last_sender_id as \"lastSenderId\",\n" +
|
|
"\ts.last_sender_name as \"lastSenderName\",\n" +
|
|
|
|
"\to.id as \"id\"\n" +
|
|
|
|
|
|
"\ts.last_sender_name as \"lastSenderName\",\n" +
|
|
|
|
"\to.doctor as \"doctor\",\n" +
|
|
|
|
"\to.consumer as \"patient\",\n" +
|
|
|
|
"\to.id as \"id\"\n" +
|
|
"FROM\n" +
|
|
"FROM\n" +
|
|
"\twlyy_outpatient o\n" +
|
|
"\twlyy_outpatient o\n" +
|
|
"LEFT JOIN wlyy_consult c ON o.id = c.relation_code\n" +
|
|
"LEFT JOIN wlyy_consult c ON o.id = c.relation_code\n" +
|
|
@ -323,6 +325,8 @@ public class TimeoutOverDueService {
|
|
for (Map<String,Object> map:mapList){
|
|
for (Map<String,Object> map:mapList){
|
|
String lastMessageTime = map.get("lastMessageTime").toString();
|
|
String lastMessageTime = map.get("lastMessageTime").toString();
|
|
String lastSenderId = map.get("lastSenderId").toString();
|
|
String lastSenderId = map.get("lastSenderId").toString();
|
|
|
|
String patient = map.get("patient").toString();
|
|
|
|
String doctor =map.get("doctor").toString();
|
|
Long lastTime = DateUtil.strToDate(lastMessageTime).getTime();
|
|
Long lastTime = DateUtil.strToDate(lastMessageTime).getTime();
|
|
Long time = currentTime-lastTime;
|
|
Long time = currentTime-lastTime;
|
|
logger.info("time"+time);
|
|
logger.info("time"+time);
|
|
@ -342,13 +346,15 @@ public class TimeoutOverDueService {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (flag){
|
|
if (flag){
|
|
BasePatientDO patientDO = basePatientDao.findById(lastSenderId);
|
|
|
|
BaseDoctorDO doctorDO = doctorDao.findById(lastSenderId);
|
|
|
|
String mobile = "";
|
|
String mobile = "";
|
|
if (patientDO!=null){
|
|
|
|
mobile = patientDO.getMobile();
|
|
|
|
}else if (doctorDO!=null){
|
|
|
|
|
|
logger.info("lastSenderId"+lastSenderId+"===="+patient+"+++"+doctor);
|
|
|
|
if (lastSenderId.equalsIgnoreCase(patient)){
|
|
|
|
BaseDoctorDO doctorDO = doctorDao.findById(doctor);
|
|
mobile = doctorDO.getMobile();
|
|
mobile = doctorDO.getMobile();
|
|
|
|
}else if (lastSenderId.equalsIgnoreCase(doctor)){
|
|
|
|
BasePatientDO patientDO = basePatientDao.findById(patient);
|
|
|
|
|
|
|
|
mobile = patientDO.getMobile();
|
|
}
|
|
}
|
|
logger.info("mobile"+mobile+flag+noReplyTime);
|
|
logger.info("mobile"+mobile+flag+noReplyTime);
|
|
if (wechatId.equalsIgnoreCase("xm_ykyy_wx")){
|
|
if (wechatId.equalsIgnoreCase("xm_ykyy_wx")){
|