From e09e1382aec0c3dd95c4d627028e59f1913bfef5 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Wed, 15 Nov 2023 10:00:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=B8=93=E5=AE=B6?= =?UTF-8?q?=E5=92=A8=E8=AF=A2=E8=AE=A2=E5=8D=95=E8=AF=84=E4=BB=B7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AppOrderEvaluateServiceImpl.java | 2 +- .../nursingorder/impl/NursingOrderServiceImpl.java | 5 ++++- .../com/xinelu/applet/vo/nursingorder/PatientOrder.java | 4 ++++ .../mapper/applet/nursingorder/NusringOrderMapper.xml | 8 ++++---- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/apporderevaluate/impl/AppOrderEvaluateServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/apporderevaluate/impl/AppOrderEvaluateServiceImpl.java index f96b827..f60a958 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/apporderevaluate/impl/AppOrderEvaluateServiceImpl.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/apporderevaluate/impl/AppOrderEvaluateServiceImpl.java @@ -98,7 +98,7 @@ public class AppOrderEvaluateServiceImpl implements IAppOrderEvaluateService { return AjaxResult.error("当前订单以失效，请选择其他订单信息！"); } if (OrderTypeEnum.HEALTH_CONSULTATION.getInfo().equals(goodsOrder.getOrderType()) && (StringUtils.isBlank(goodsOrder.getOrderStatus()) || !goodsOrder.getOrderStatus().equals(GooodsOrderStatusEnum.COMPLETED.getInfo()))) { - return AjaxResult.error("当前订单未确认完成，请医生先确认完成后进行评价！"); + return AjaxResult.error("当前订单未确认完成，请完成后进行评价！"); } if (!OrderTypeEnum.HEALTH_CONSULTATION.getInfo().equals(goodsOrder.getOrderType()) && (StringUtils.isBlank(goodsOrder.getOrderStatus()) || !goodsOrder.getOrderStatus().equals(GooodsOrderStatusEnum.RECEIVED_GOODS.getInfo()))) { return AjaxResult.error("当前订单未确认收货，请先确认收货后进行评价！"); 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 ac58321..6ea183f 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 @@ -175,7 +175,10 @@ public class NursingOrderServiceImpl implements INursingOrderService { } if (Objects.nonNull(resultHttp) && CollectionUtils.isNotEmpty(resultHttp.getData()) && Objects.nonNull(resultHttp.getData().get(0).getOrderNo())) { List data = resultHttp.getData(); - data.forEach(item -> item.setOrderSource(OrderSourceEnum.FAMILY_DOCTOR.getInfo())); + for (PatientOrder patientOrder : data) { + patientOrder.setOrderSource(OrderSourceEnum.FAMILY_DOCTOR.getInfo()); + patientOrder.setOrderType(OrderSourceEnum.FAMILY_DOCTOR.getInfo()); + } List orderEvaluate = nursingOrderMapper.getOrderEvaluateByPatientId(nurseOrder.getParentId()); if (CollectionUtils.isNotEmpty(orderEvaluate) && EVALUATED.equals(nurseOrder.getOrderStatus())) { for (PatientOrder patientOrder : orderEvaluate) { diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/PatientOrder.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/PatientOrder.java index b3771dc..7de5b5f 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/PatientOrder.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/PatientOrder.java @@ -82,6 +82,10 @@ public class PatientOrder extends BaseDomain implements Serializable { */ private String orderSource; + /** + * 科室人员头像地址 + */ + private String personPictureUrl; @Override public boolean equals(Object o) { diff --git a/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml b/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml index 68a1e8e..f2bb8a2 100644 --- a/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml +++ b/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml @@ -128,11 +128,11 @@ gr.update_time appleTime, (select rf.success_time from refund_info rf where rf.order_no = gr.order_no) update_time, IF( gr.order_type = 'HEALTH_CONSULTATION', ( SELECT person_picture_url FROM hospital_person_info WHERE id = - gr.hospital_person_id ), NULL ) person_picture_url, + gr.hospital_person_id ), NULL ) personPictureUrl, IF( gr.order_type = 'HEALTH_CONSULTATION', ( SELECT person_phone FROM hospital_person_info WHERE id = - gr.hospital_person_id ), NULL ) person_phone, + gr.hospital_person_id ), NULL ) personPhone, IF( gr.order_type = 'HEALTH_CONSULTATION', ( SELECT academic_title FROM hospital_person_info WHERE id = - gr.hospital_person_id ), NULL ) academic_title, + gr.hospital_person_id ), NULL ) academicTitle, gr.hospital_person_name FROM goods_order gr @@ -381,7 +381,7 @@ gor.order_type, god.goods_name orderName, gad.attribute_piture_url pictureUrl, - hpi.person_picture_url, + hpi.person_picture_url personPictureUrl, nei.composite_score, 'SPRING_DOCTOR' AS orderSource FROM