|
|
@ -53,7 +53,6 @@ import java.io.IOException;
|
|
|
import java.io.InputStream;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.nio.charset.Charset;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
|
|
|
|
/**
|
|
|
@ -2082,7 +2081,7 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
|
|
|
int start = 0 == page ? page++ : (page - 1) * size;
|
|
|
int end = 0 == size ? 15 : page * size;
|
|
|
|
|
|
String sql = "select ds.doctor,d.name, d.job_name as jobName, 1 as sortFlag " +
|
|
|
String sql = "select ds.doctor,d.name, d.job_title_name as jobName, 1 as sortFlag " +
|
|
|
" from wlyy_door_doctor_status ds " +
|
|
|
" JOIN (select b.* from base_doctor b,base_doctor_hospital dh where b.id=dh.doctor_code and dh.del = 1 and dh.org_code='" + hospital + "') d on ds.doctor = d.id " +
|
|
|
" where ds.status in (1,2,3,4)" +
|
|
|
@ -2090,7 +2089,7 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
|
|
|
|
|
|
String countSql = "select count(ds.id) " +
|
|
|
"from wlyy_door_doctor_status ds " +
|
|
|
" JOIN (select b.* from base_doctor b,base_doctor_hospital dh where b.id=dh.doctor_code and dh.del = 1 and dh.org_code= '" + hospital + "') d on ds.doctor = d.code " +
|
|
|
" JOIN (select b.* from base_doctor b,base_doctor_hospital dh where b.id=dh.doctor_code and dh.del = 1 and dh.org_code= '" + hospital + "') d on ds.doctor = d.id " +
|
|
|
"where ds.status in (1,2,3,4)";
|
|
|
List<Map<String,Object>> doctorList = new ArrayList<>();
|
|
|
try {
|
|
|
@ -2435,18 +2434,18 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
|
|
|
messageDO.setReceiverName(ReceiverName);
|
|
|
net.sf.json.JSONObject data = new net.sf.json.JSONObject();
|
|
|
data.put("name", ReceiverName);
|
|
|
data.put("age", IdCardUtil.getAgeForIdcard(idCard));
|
|
|
try {
|
|
|
data.put("age", IdCardUtil.getAgeForIdcard(idCard));
|
|
|
data.put("gender", IdCardUtil.getSexForIdcard(idCard));
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
data.put("msg", msg);
|
|
|
messageDO.setData(msg);
|
|
|
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
Date date = messageDO.getCreateTime();
|
|
|
String dateTime=format.format(date);
|
|
|
messageDO.setCreateTime(date);
|
|
|
// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
// Date date = messageDO.getCreateTime();
|
|
|
// String dateTime=format.format(date);
|
|
|
messageDO.setCreateTime(new Date());
|
|
|
messageUtil.saveSystemMessage(messageDO);
|
|
|
/* Message message=new Message();
|
|
|
message.setCzrq(new Date());
|
|
|
@ -2733,15 +2732,6 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
|
|
|
}
|
|
|
//判断工单是否已存在，新建或者编辑
|
|
|
if(StringUtils.isBlank(orderDO.getId())) {
|
|
|
/* SignFamily signFamily = signFamilyDao.findSignFamilyByPatient(orderDO.getPatient());
|
|
|
if (signFamily == null) {
|
|
|
result.put(ResponseContant.resultFlag, ResponseContant.fail);
|
|
|
String failMsg = "当前服务对象未完成家庭医生签约，请完成签约后再预约上门服务！";
|
|
|
result.put(ResponseContant.resultMsg, failMsg);
|
|
|
logger.error(failMsg);
|
|
|
return result;
|
|
|
}*/
|
|
|
|
|
|
//已取消的订单也可以申请
|
|
|
boolean bool = wlyyDoorServiceOrderDao.existsByPatientAndStatusIn(orderDO.getPatient(),
|
|
|
new Integer[]{WlyyDoorServiceOrderDO.Status.waitForAccept.getType(),
|
|
|
@ -2797,9 +2787,6 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
|
|
|
sql += " and d.id = '"+orderDO.getDoctor()+"'";
|
|
|
List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
|
|
|
|
|
|
/* BaseDoctorDO doctor = doctorDao.findById(orderDO.getDoctor());
|
|
|
Hospital hospital = hospitalDao.findByCode(doctor.getHospital());
|
|
|
doorOrderService.acceptOrder1(orderDO.getId(), doctor.getJob(), doctor.getJobName(), hospital.getLevel());*/
|
|
|
doorOrderService.acceptOrder1(orderDO.getId(), list.get(0).get("job_title_code").toString(),
|
|
|
list.get(0).get("job_title_name").toString(), Integer.valueOf(list.get(0).get("org_level").toString()));
|
|
|
}catch (Exception e){
|
