xinyilu/xinelu-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

小程序专家咨询订单评价修改

Browse Source
This commit is contained in:
zhangheng 2023-11-15 10:00:51 +08:00
parent 68f7b97eaa
commit e09e1382ae
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/apporderevaluate/impl/AppOrderEvaluateServiceImpl.java
View File

@ -98,7 +98,7 @@ public class AppOrderEvaluateServiceImpl implements IAppOrderEvaluateService {
return AjaxResult.error("当前订单以失效，请选择其他订单信息！"); return AjaxResult.error("当前订单以失效，请选择其他订单信息！");
} }
if (OrderTypeEnum.HEALTH_CONSULTATION.getInfo().equals(goodsOrder.getOrderType()) && (StringUtils.isBlank(goodsOrder.getOrderStatus()) || !goodsOrder.getOrderStatus().equals(GooodsOrderStatusEnum.COMPLETED.getInfo()))) { 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()))) { if (!OrderTypeEnum.HEALTH_CONSULTATION.getInfo().equals(goodsOrder.getOrderType()) && (StringUtils.isBlank(goodsOrder.getOrderStatus()) || !goodsOrder.getOrderStatus().equals(GooodsOrderStatusEnum.RECEIVED_GOODS.getInfo()))) {
return AjaxResult.error("当前订单未确认收货，请先确认收货后进行评价！"); return AjaxResult.error("当前订单未确认收货，请先确认收货后进行评价！");

5
xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java
View File

@ -175,7 +175,10 @@ public class NursingOrderServiceImpl implements INursingOrderService {
} }
if (Objects.nonNull(resultHttp) && CollectionUtils.isNotEmpty(resultHttp.getData()) && Objects.nonNull(resultHttp.getData().get(0).getOrderNo())) { if (Objects.nonNull(resultHttp) && CollectionUtils.isNotEmpty(resultHttp.getData()) && Objects.nonNull(resultHttp.getData().get(0).getOrderNo())) {
List<PatientOrder> data = resultHttp.getData(); List<PatientOrder> 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<PatientOrder> orderEvaluate = nursingOrderMapper.getOrderEvaluateByPatientId(nurseOrder.getParentId()); List<PatientOrder> orderEvaluate = nursingOrderMapper.getOrderEvaluateByPatientId(nurseOrder.getParentId());
if (CollectionUtils.isNotEmpty(orderEvaluate) && EVALUATED.equals(nurseOrder.getOrderStatus())) { if (CollectionUtils.isNotEmpty(orderEvaluate) && EVALUATED.equals(nurseOrder.getOrderStatus())) {
for (PatientOrder patientOrder : orderEvaluate) { for (PatientOrder patientOrder : orderEvaluate) {

4
xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/PatientOrder.java
View File

@ -82,6 +82,10 @@ public class PatientOrder extends BaseDomain implements Serializable {
*/ */
private String orderSource; private String orderSource;
/**
* 科室人员头像地址
*/
private String personPictureUrl;
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {

8
xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml
View File

@ -128,11 +128,11 @@
gr.update_time appleTime, gr.update_time appleTime,
(select rf.success_time from refund_info rf where rf.order_no = gr.order_no) update_time, (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 = 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 = 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 = 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 gr.hospital_person_name
FROM FROM
goods_order gr goods_order gr
@ -381,7 +381,7 @@
gor.order_type, gor.order_type,
god.goods_name orderName, god.goods_name orderName,
gad.attribute_piture_url pictureUrl, gad.attribute_piture_url pictureUrl,
hpi.person_picture_url, hpi.person_picture_url personPictureUrl,
nei.composite_score, nei.composite_score,
'SPRING_DOCTOR' AS orderSource 'SPRING_DOCTOR' AS orderSource
FROM FROM