服务评价
This commit is contained in:
parent
5eb498766e
commit
1cd9af299b
@ -162,28 +162,34 @@ public class NursingOrderServiceImpl implements INursingOrderService {
|
|||||||
if (CollectionUtils.isNotEmpty(goodsOrderAndConsultationOrder)) {
|
if (CollectionUtils.isNotEmpty(goodsOrderAndConsultationOrder)) {
|
||||||
patientOrders.addAll(goodsOrderAndConsultationOrder);
|
patientOrders.addAll(goodsOrderAndConsultationOrder);
|
||||||
}
|
}
|
||||||
String result = HttpUtils.sendGet(SpringUtils.getFdUrl(nurseOrder.getRegion()) + "/performance/recordV2/" + nurseOrder.getCardNo());
|
if (Objects.nonNull(nurseOrder.getRegion()) && "3".equals(nurseOrder.getRegion())) {
|
||||||
if (StringUtils.isBlank(result)) {
|
try {
|
||||||
log.info("获取家医小程序用户订单信息失败,result = " + result);
|
String result = HttpUtils.sendGet(SpringUtils.getFdUrl(nurseOrder.getRegion()) + "/performance/recordV2/" + nurseOrder.getCardNo());
|
||||||
}
|
if (StringUtils.isBlank(result)) {
|
||||||
PatientOrderVO resultHttp = JSON.parseObject(result, PatientOrderVO.class);
|
log.info("获取家医小程序用户订单信息失败,result = " + result);
|
||||||
if (Objects.nonNull(resultHttp) && CollectionUtils.isNotEmpty(resultHttp.getData()) && Objects.nonNull(resultHttp.getData().get(0).getOrderNo())) {
|
|
||||||
List<PatientOrder> data = resultHttp.getData();
|
|
||||||
data.forEach(item -> item.setOrderSource(OrderSourceEnum.FAMILY_DOCTOR.getInfo()));
|
|
||||||
List<PatientOrder> orderEvaluate = nursingOrderMapper.getOrderEvaluateByPatientId(nurseOrder.getParentId());
|
|
||||||
if (CollectionUtils.isNotEmpty(orderEvaluate) && EVALUATED.equals(nurseOrder.getOrderStatus())) {
|
|
||||||
for (PatientOrder patientOrder : orderEvaluate) {
|
|
||||||
PatientOrder dataFirst = data.stream().filter(Objects::nonNull).filter(item -> Objects.nonNull(item.getOrderNo()) && patientOrder.getOrderNo().equals(item.getOrderNo())).findFirst().orElse(new PatientOrder());
|
|
||||||
dataFirst.setCompositeScore(patientOrder.getCompositeScore());
|
|
||||||
patientOrders.add(dataFirst);
|
|
||||||
}
|
}
|
||||||
}
|
PatientOrderVO resultHttp = JSON.parseObject(result, PatientOrderVO.class);
|
||||||
if (CollectionUtils.isNotEmpty(orderEvaluate) && NOT_EVALUATED.equals(nurseOrder.getOrderStatus())) {
|
if (Objects.nonNull(resultHttp) && CollectionUtils.isNotEmpty(resultHttp.getData()) && Objects.nonNull(resultHttp.getData().get(0).getOrderNo())) {
|
||||||
Collection<PatientOrder> subtract = CollectionUtils.subtract(data, orderEvaluate);
|
List<PatientOrder> data = resultHttp.getData();
|
||||||
patientOrders.addAll(subtract);
|
data.forEach(item -> item.setOrderSource(OrderSourceEnum.FAMILY_DOCTOR.getInfo()));
|
||||||
}
|
List<PatientOrder> orderEvaluate = nursingOrderMapper.getOrderEvaluateByPatientId(nurseOrder.getParentId());
|
||||||
if (CollectionUtils.isEmpty(orderEvaluate) && NOT_EVALUATED.equals(nurseOrder.getOrderStatus())) {
|
if (CollectionUtils.isNotEmpty(orderEvaluate) && EVALUATED.equals(nurseOrder.getOrderStatus())) {
|
||||||
patientOrders.addAll(data);
|
for (PatientOrder patientOrder : orderEvaluate) {
|
||||||
|
PatientOrder dataFirst = data.stream().filter(Objects::nonNull).filter(item -> Objects.nonNull(item.getOrderNo()) && patientOrder.getOrderNo().equals(item.getOrderNo())).findFirst().orElse(new PatientOrder());
|
||||||
|
dataFirst.setCompositeScore(patientOrder.getCompositeScore());
|
||||||
|
patientOrders.add(dataFirst);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (CollectionUtils.isNotEmpty(orderEvaluate) && NOT_EVALUATED.equals(nurseOrder.getOrderStatus())) {
|
||||||
|
Collection<PatientOrder> subtract = CollectionUtils.subtract(data, orderEvaluate);
|
||||||
|
patientOrders.addAll(subtract);
|
||||||
|
}
|
||||||
|
if (CollectionUtils.isEmpty(orderEvaluate) && NOT_EVALUATED.equals(nurseOrder.getOrderStatus())) {
|
||||||
|
patientOrders.addAll(data);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("查询家医履约评价记录异常: " + e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
TableDataInfo rspData = new TableDataInfo();
|
TableDataInfo rspData = new TableDataInfo();
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user