|
@@ -523,7 +523,7 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
|
|
data.setDistrictName(item.getHospitalName());
|
|
data.setDistrictName(item.getHospitalName());
|
|
String amountStr = String.format("%.2f", amount);
|
|
String amountStr = String.format("%.2f", amount);
|
|
data.setAmount(amountStr);
|
|
data.setAmount(amountStr);
|
|
- data.setTimeRange(item.getStartTime()+"~"+item.getEndTime());
|
|
|
|
|
|
+ data.setTimeRange(item.getStartTime() + "~" + item.getEndTime());
|
|
data.setQrCode("");
|
|
data.setQrCode("");
|
|
// 预约单状态 (0-待支付, 1-预约成功, 2-叫号中,7-已就诊,8-预期未就诊,9-取消预约)
|
|
// 预约单状态 (0-待支付, 1-预约成功, 2-叫号中,7-已就诊,8-预期未就诊,9-取消预约)
|
|
int orderStatus = item.getRegisteredStatus();
|
|
int orderStatus = item.getRegisteredStatus();
|
|
@@ -536,8 +536,20 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
|
|
statusName = "待支付";
|
|
statusName = "待支付";
|
|
orderStatus = 0;
|
|
orderStatus = 0;
|
|
} else if (item.getPaymentStatus() == PaymentStatusEnum.Success.getValue()) {
|
|
} else if (item.getPaymentStatus() == PaymentStatusEnum.Success.getValue()) {
|
|
- statusName = "待就诊";
|
|
|
|
- orderStatus = 1;
|
|
|
|
|
|
+ GetCommonOrderListRequest reqTwo = GetCommonOrderListRequest.newBuilder()
|
|
|
|
+ .setPageIndex(1)
|
|
|
|
+ .setPageSize(999)
|
|
|
|
+ .setUserId(userId)
|
|
|
|
+ .build();
|
|
|
|
+ GetCommonOrderListResponse resTwo = taiheRegisterServiceBlockingStub.getCommonOrderList(reqTwo);
|
|
|
|
+ if (resTwo.getCode() == ResultCode.SUCCEED_VALUE) {
|
|
|
|
+ for (CommonOrder itemTwo : resTwo.getOrderList()) {
|
|
|
|
+ if (orderId == itemTwo.getOrderId()){
|
|
|
|
+ statusName = itemTwo.getStatusName();
|
|
|
|
+ orderStatus = getStatus(itemTwo.getStatusName());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
data.setStatus(orderStatus);
|
|
data.setStatus(orderStatus);
|
|
data.setStatusStr(statusName);
|
|
data.setStatusStr(statusName);
|