|
@ -16,6 +16,7 @@ import com.yihu.wlyy.service.manager.sign.SignFamilyService;
|
|
|
import com.yihu.wlyy.service.synergy.SynergyManageService;
|
|
|
import com.yihu.wlyy.util.DateUtil;
|
|
|
import com.yihu.wlyy.util.HttpClientUtil;
|
|
|
import com.yihu.wlyy.util.SpringContextUtil;
|
|
|
import io.swagger.models.auth.In;
|
|
|
import org.apache.commons.collections.map.HashedMap;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
@ -73,7 +74,9 @@ public class CustomerService extends BaseService{
|
|
|
private ManageSynergyWorkorderReserveConsultDao manageSynergyWorkorderReserveConsultDao;
|
|
|
@Autowired
|
|
|
private SynergyManageService synergyManageService;
|
|
|
|
|
|
enum profile{
|
|
|
dev,devtest,test,prod
|
|
|
}
|
|
|
|
|
|
@Value(("${doctorAssistant.api}")+"/wlyygc/doctor/message")
|
|
|
private String messageApi;
|
|
@ -206,7 +209,6 @@ public class CustomerService extends BaseService{
|
|
|
par.add(new BasicNameValuePair("mobiles", mobile));
|
|
|
par.add(new BasicNameValuePair("content", msg));
|
|
|
try {
|
|
|
|
|
|
logger.info("====================================================================");
|
|
|
String result = HttpClientUtil.post(messageApi+"/sendMessage",par,"UTF-8");
|
|
|
logger.info("发送短信消息返回结果:"+result);
|
|
@ -582,9 +584,12 @@ public class CustomerService extends BaseService{
|
|
|
callService = callServiceDao.save(callService);
|
|
|
//待处理发送消息给医生
|
|
|
sendCallServiceMes(callService);
|
|
|
//发送消息
|
|
|
sendWxMes(callService);
|
|
|
|
|
|
String activeProfile = SpringContextUtil.getActiveProfile();
|
|
|
if(profile.prod.name().equals(activeProfile)){//正式环境才推送
|
|
|
//发送消息
|
|
|
sendWxMes(callService);
|
|
|
}
|
|
|
|
|
|
//将旧数据存储到新表---------START
|
|
|
ManageSynergyWorkorderDO manageSynergyWorkorderDO = new ManageSynergyWorkorderDO();
|
|
|
// 协同服务工单的服务对象表
|
|
@ -638,10 +643,11 @@ public class CustomerService extends BaseService{
|
|
|
manageSynergyWorkorderServicerDO.setCode(UUID.randomUUID().toString());
|
|
|
manageSynergyWorkorderServicerDO.setServicePatientCode(callService.getPatient());
|
|
|
manageSynergyWorkorderServicerDO.setServicePatientName(callService.getPatientName());
|
|
|
manageSynergyWorkorderServicerDO.setExecutorType(1);
|
|
|
manageSynergyWorkorderServicerDao.save(manageSynergyWorkorderServicerDO);
|
|
|
|
|
|
manageSynergyWorkorderExecutorDO.setWorkorderCode(manageSynergyWorkorderDO.getCode());
|
|
|
manageSynergyWorkorderExecutorDO.setDel(0);
|
|
|
manageSynergyWorkorderExecutorDO.setDel(1);
|
|
|
manageSynergyWorkorderExecutorDO.setExecutorType(3);
|
|
|
manageSynergyWorkorderExecutorDO.setExecutorCode(callService.getUser());
|
|
|
manageSynergyWorkorderExecutorDO.setExecutorName(callService.getUserName());
|
|
@ -666,8 +672,13 @@ public class CustomerService extends BaseService{
|
|
|
callServiceDao.save(callService);
|
|
|
//待处理发送消息给医生
|
|
|
sendCallServiceMes(callService);
|
|
|
|
|
|
//发送消息
|
|
|
sendWxMes(callService);
|
|
|
String activeProfile = SpringContextUtil.getActiveProfile();
|
|
|
if(profile.prod.name().equals(activeProfile)){//正式环境才推送
|
|
|
//发送消息
|
|
|
sendWxMes(callService);
|
|
|
}
|
|
|
|
|
|
//将旧数据存储到新表---------START
|
|
|
ManageSynergyWorkorderDO manageSynergyWorkorderDO = manageSynergyWorkOrderDao.findByRelationCode(callService.getCode());
|
|
@ -720,10 +731,11 @@ public class CustomerService extends BaseService{
|
|
|
manageSynergyWorkorderServicerDO.setServicePatientCode(callService.getPatient());
|
|
|
manageSynergyWorkorderServicerDO.setServicePatientName(callService.getPatientName());
|
|
|
manageSynergyWorkorderServicerDO.setCreateTime(new Date());
|
|
|
manageSynergyWorkorderServicerDO.setExecutorType(1);
|
|
|
manageSynergyWorkorderServicerDao.save(manageSynergyWorkorderServicerDO);
|
|
|
|
|
|
manageSynergyWorkorderExecutorDO.setWorkorderCode(manageSynergyWorkorderDO.getCode());
|
|
|
manageSynergyWorkorderExecutorDO.setDel(0);
|
|
|
manageSynergyWorkorderExecutorDO.setDel(1);
|
|
|
manageSynergyWorkorderExecutorDO.setExecutorType(3);
|
|
|
manageSynergyWorkorderExecutorDO.setExecutorCode(callService.getUser());
|
|
|
manageSynergyWorkorderExecutorDO.setExecutorName(callService.getUserName());
|