From 1cd9af299bc3c187dc613d182b3a0fd00f197bd5 Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Thu, 9 Nov 2023 10:10:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=AF=84=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/NursingOrderServiceImpl.java         | 48 +++++++++++--------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java
index 9e7ee64..3a4ec16 100644
--- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java
+++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java
@@ -162,28 +162,34 @@ public class NursingOrderServiceImpl implements INursingOrderService {
         if (CollectionUtils.isNotEmpty(goodsOrderAndConsultationOrder)) {
             patientOrders.addAll(goodsOrderAndConsultationOrder);
         }
-        String result = HttpUtils.sendGet(SpringUtils.getFdUrl(nurseOrder.getRegion()) + "/performance/recordV2/" + nurseOrder.getCardNo());
-        if (StringUtils.isBlank(result)) {
-            log.info("获取家医小程序用户订单信息失败，result = " + result);
-        }
-        PatientOrderVO resultHttp = JSON.parseObject(result, PatientOrderVO.class);
-        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);
+        if (Objects.nonNull(nurseOrder.getRegion()) && "3".equals(nurseOrder.getRegion())) {
+            try {
+                String result = HttpUtils.sendGet(SpringUtils.getFdUrl(nurseOrder.getRegion()) + "/performance/recordV2/" + nurseOrder.getCardNo());
+                if (StringUtils.isBlank(result)) {
+                    log.info("获取家医小程序用户订单信息失败，result = " + result);
                 }
-            }
-            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);
+                PatientOrderVO resultHttp = JSON.parseObject(result, PatientOrderVO.class);
+                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);
+                        }
+                    }
+                    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();