|
@ -293,7 +293,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
BasePatientDO patientDO = basePatientDao.findById(patient);
|
|
|
outpatientVO.setSex(patientDO.getSex() + "");
|
|
|
outpatientVO.setBirthday(patientDO.getBirthday());
|
|
|
outpatientVO.setPatient(patientDO.getIdcard());
|
|
|
outpatientVO.setIdcard(patientDO.getIdcard());
|
|
|
return outpatientVO;
|
|
|
}
|
|
|
return null;
|
|
@ -3226,7 +3226,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
}
|
|
|
}
|
|
|
}*/
|
|
|
List<Map<String,Object>> waitinglist = new ArrayList<>();
|
|
|
List<com.alibaba.fastjson.JSONArray> waitinglist = new ArrayList<>();
|
|
|
if (scoreList != null && scoreList.size() > 0) {
|
|
|
List<String> stringList = new ArrayList<>();
|
|
|
for (Map<String, Object> scorepatient : scoreList) {
|
|
@ -3241,15 +3241,13 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
}
|
|
|
for (String str:stringList){
|
|
|
com.alibaba.fastjson.JSONArray array = new com.alibaba.fastjson.JSONArray();
|
|
|
Map<String,Object> map = new HashedMap();
|
|
|
for (Map<String, Object> scorepatient : scoreList){
|
|
|
String id = (String) scorepatient.get("id");
|
|
|
if (id!=null&&str.equalsIgnoreCase(id)){
|
|
|
array.add(scorepatient);
|
|
|
}
|
|
|
}
|
|
|
map.put(str,array);
|
|
|
waitinglist.add(map);
|
|
|
waitinglist.add(array);
|
|
|
}
|
|
|
}
|
|
|
|
|
@ -5332,6 +5330,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
System.out.println("获取顺丰物流面单信息:6");
|
|
|
|
|
|
}
|
|
|
wlyyPrescriptionDOS.setStatus(32);
|
|
|
prescriptionDao.save(wlyyPrescriptionDOS);
|
|
|
|
|
|
if (sfexpress_obj != null && StringUtils.isNoneBlank(sfexpress_obj.getMailno())) {
|
|
|
com.alibaba.fastjson.JSONObject object = sfexpressService.postSFOrderQueryService(sfexpress_obj);
|
|
@ -5370,6 +5370,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
System.out.println("获取顺丰物流面单信息:8");
|
|
|
}
|
|
|
}
|
|
|
|
|
|
}
|
|
|
System.out.println("获取顺丰物流面单信息:9");
|
|
|
return result;
|
|
@ -5432,7 +5433,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
System.out.println("获取顺丰物流面单信息:6");
|
|
|
|
|
|
}
|
|
|
|
|
|
wlyyPrescriptionDOS.setStatus(32);
|
|
|
prescriptionDao.save(wlyyPrescriptionDOS);
|
|
|
if (sfexpress_obj != null && StringUtils.isNoneBlank(sfexpress_obj.getMailno())) {
|
|
|
com.alibaba.fastjson.JSONObject object = sfexpressService.postSFOrderQueryService(sfexpress_obj);
|
|
|
System.out.println("获取顺丰物流面单信息7-1"+object.toJSONString());
|