|
@ -95,6 +95,7 @@ public class SynergyManageService extends BaseJpaService {
|
|
Integer isMyTask,Integer status,Integer priority,Integer timeout,String workorderCode,
|
|
Integer isMyTask,Integer status,Integer priority,Integer timeout,String workorderCode,
|
|
String principal,String serviceStartTime,String serviceEndTime,String patientName,String ssc,String idcard,
|
|
String principal,String serviceStartTime,String serviceEndTime,String patientName,String ssc,String idcard,
|
|
Integer userType,Integer isAcceptTask,String userName,String hospitalName,Integer page, Integer pageSize) throws Exception{
|
|
Integer userType,Integer isAcceptTask,String userName,String hospitalName,Integer page, Integer pageSize) throws Exception{
|
|
|
|
|
|
String servicerTable = " left join wlyy.manage_synergy_workorder_executor e on e.workorder_code=w.code AND e.del = 1 " ;
|
|
String servicerTable = " left join wlyy.manage_synergy_workorder_executor e on e.workorder_code=w.code AND e.del = 1 " ;
|
|
String whereSql = "";
|
|
String whereSql = "";
|
|
if(userType==3){//客服管理员
|
|
if(userType==3){//客服管理员
|
|
@ -171,7 +172,7 @@ public class SynergyManageService extends BaseJpaService {
|
|
}
|
|
}
|
|
//服务对象
|
|
//服务对象
|
|
if(StringUtils.isNotEmpty(patientName)){
|
|
if(StringUtils.isNotEmpty(patientName)){
|
|
whereSql+=" and s.service_patient_name like '%"+patientName+"%' ";
|
|
|
|
|
|
whereSql+=" and s.service_patient_name like '%"+keywords+"%' ";
|
|
}
|
|
}
|
|
//社保卡号
|
|
//社保卡号
|
|
if(StringUtils.isNotEmpty(ssc)){
|
|
if(StringUtils.isNotEmpty(ssc)){
|
|
@ -185,7 +186,6 @@ public class SynergyManageService extends BaseJpaService {
|
|
if(StringUtils.isNotEmpty(userName)){
|
|
if(StringUtils.isNotEmpty(userName)){
|
|
whereSql+=" and w.create_user_name like '%"+userName+"%' ";
|
|
whereSql+=" and w.create_user_name like '%"+userName+"%' ";
|
|
}
|
|
}
|
|
//所属机构
|
|
|
|
if(StringUtils.isNotEmpty(hospitalName)){
|
|
if(StringUtils.isNotEmpty(hospitalName)){
|
|
whereSql+=" and w.hospital_name like '%"+hospitalName+"%' ";
|
|
whereSql+=" and w.hospital_name like '%"+hospitalName+"%' ";
|
|
}
|
|
}
|
|
@ -242,7 +242,6 @@ public class SynergyManageService extends BaseJpaService {
|
|
map.put("finishedServicerCount",finishedServicerCount);//服务完成人数
|
|
map.put("finishedServicerCount",finishedServicerCount);//服务完成人数
|
|
map.put("userName",one.get("create_user_name"));
|
|
map.put("userName",one.get("create_user_name"));
|
|
map.put("hospitalName",one.get("hospital_name"));
|
|
map.put("hospitalName",one.get("hospital_name"));
|
|
map.put("remark",one.get("remark"));
|
|
|
|
resultList.add(map);
|
|
resultList.add(map);
|
|
}
|
|
}
|
|
Map<String,Object> resultMap = new HashMap<>();
|
|
Map<String,Object> resultMap = new HashMap<>();
|
|
@ -515,6 +514,8 @@ public class SynergyManageService extends BaseJpaService {
|
|
workorderDO.setReturnedRemark(jsonObject.getString("returnedRemark"));
|
|
workorderDO.setReturnedRemark(jsonObject.getString("returnedRemark"));
|
|
this.sendMessage(workorderDO, null, 26);
|
|
this.sendMessage(workorderDO, null, 26);
|
|
}else if(status == 2){
|
|
}else if(status == 2){
|
|
|
|
//设置接收时间
|
|
|
|
workorderDO.setReceiverTime(new Date());
|
|
//创建负责人信息
|
|
//创建负责人信息
|
|
List<ManageSynergyWorkorderExecutorDO> list = new ArrayList<>();
|
|
List<ManageSynergyWorkorderExecutorDO> list = new ArrayList<>();
|
|
String manager = jsonObject.getString("manager");
|
|
String manager = jsonObject.getString("manager");
|
|
@ -534,17 +535,19 @@ public class SynergyManageService extends BaseJpaService {
|
|
|
|
|
|
//保存协作者信息
|
|
//保存协作者信息
|
|
String collaborator = jsonObject.getString("collaborator");
|
|
String collaborator = jsonObject.getString("collaborator");
|
|
String[] collaborators = manager.split(",");
|
|
|
|
for(String c : collaborators){
|
|
|
|
ManageSynergyWorkorderExecutorDO executorDO = new ManageSynergyWorkorderExecutorDO();
|
|
|
|
User u = userDao.findByCode(c);
|
|
|
|
executorDO.setCode(getCode());
|
|
|
|
executorDO.setWorkorderCode(code);
|
|
|
|
executorDO.setExecutorType(1);
|
|
|
|
executorDO.setExecutorCode(c);
|
|
|
|
executorDO.setExecutorName(u.getName());
|
|
|
|
executorDO.setDel(1);
|
|
|
|
list.add(executorDO);
|
|
|
|
|
|
if(StringUtils.isNotBlank(collaborator)) {
|
|
|
|
String[] collaborators = collaborator.split(",");
|
|
|
|
for (String c : collaborators) {
|
|
|
|
ManageSynergyWorkorderExecutorDO executorDO = new ManageSynergyWorkorderExecutorDO();
|
|
|
|
User u = userDao.findByCode(c);
|
|
|
|
executorDO.setCode(getCode());
|
|
|
|
executorDO.setWorkorderCode(code);
|
|
|
|
executorDO.setExecutorType(2);
|
|
|
|
executorDO.setExecutorCode(c);
|
|
|
|
executorDO.setExecutorName(u.getName());
|
|
|
|
executorDO.setDel(1);
|
|
|
|
list.add(executorDO);
|
|
|
|
}
|
|
}
|
|
}
|
|
workorderExecutorDao.save(list);
|
|
workorderExecutorDao.save(list);
|
|
}
|
|
}
|
|
@ -1127,6 +1130,39 @@ public class SynergyManageService extends BaseJpaService {
|
|
ws.addCell(label);
|
|
ws.addCell(label);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public List<Map<String,Object>> getDealList(String idcard){
|
|
|
|
Patient patient = patientDao.findByIdcard(idcard);
|
|
|
|
if (patient==null){
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
String sql ="SELECT" +
|
|
|
|
" s.create_time," +
|
|
|
|
" s.service_patient_name," +
|
|
|
|
" w.priority," +
|
|
|
|
" w.relation_code," +
|
|
|
|
" w.relation_code_name," +
|
|
|
|
" w.create_user_type," +
|
|
|
|
" w.create_user_name," +
|
|
|
|
" w.create_user," +
|
|
|
|
" w.remark," +
|
|
|
|
" w.service_time" +
|
|
|
|
" FROM" +
|
|
|
|
" `manage_synergy_workorder_servicer` s" +
|
|
|
|
" LEFT JOIN manage_synergy_workorder w ON s.workorder_code = w.`code`" +
|
|
|
|
" WHERE" +
|
|
|
|
" s.service_patient_code = '"+patient.getCode()+"'" +
|
|
|
|
" AND s.`status` = 1" +
|
|
|
|
" ORDER BY" +
|
|
|
|
" s.create_time" +
|
|
|
|
" LIMIT 2";
|
|
|
|
List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
|
|
|
|
for (Map<String,Object> map : list){
|
|
|
|
int isOver = isServiceOverTime(DateUtil.strToDate(String.valueOf(map.get("service_time")),DateUtil.YYYY_MM_DD_HH_MM_SS));
|
|
|
|
map.put("isOver",isOver);
|
|
|
|
}
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
*
|
|
*
|
|
* @param workorderCode
|
|
* @param workorderCode
|