fix 修改挂号详情接口

onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/service/impl/IsvRegisterServiceImpl.java

@@ -493,7 +493,6 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
     public QueryOrderDetailResponseData queryOrderDetail(QueryOrderDetailRequest request) throws Exception {
         if (Checker.isNone(request.getOrderId())) {
             throw new AppMessageException("没有挂号详情");
-
         }
         int orderId = Integer.parseInt(request.getOrderId());
         int userId = ContextHelper.getCurrentUserIdWrapped();
@@ -526,18 +525,21 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
                 String statusName = "";
                 if ((item.getRegisteredStatus() & RegisteredStatusEnum.Cancel.getValue()) == RegisteredStatusEnum.Cancel.getValue() ||
                         (item.getRegisteredStatus() & RegisteredStatusEnum.Back.getValue()) == RegisteredStatusEnum.Back.getValue()) {
-                    statusName = "已取消";
-                    orderStatus = 1;
+                    statusName = "取消预约";
+                    orderStatus = 9;
                 } else if (item.getPaymentStatus() == PaymentStatusEnum.Pending.getValue()) {
                     statusName = "待支付";
-                    orderStatus = 2;
+                    orderStatus = 0;
                 } else if (item.getPaymentStatus() == PaymentStatusEnum.Success.getValue()) {
-                    statusName = "待就诊";
-                    orderStatus = 3;
+                    statusName = "预约成功";
+                    orderStatus = 1;
                 }
                 data.setStatus(orderStatus);
                 data.setStatusStr(statusName);
-                data.setCreateTime(Checker.getStringValue(item.getStartTime()));
+                data.setSystemTime(DateUtil.convertTimestampToDateString(item.getCreateTime()));
+                data.setCreateTime(DateUtil.convertTimestampToDateString(item.getCreateTime()));
+                data.setSex(SexEnum.getSexDisplayName(Checker.getIntegerValue(item.getSex())));
+                data.setStartTime(Checker.getStringValue(item.getStartTime()));
                 data.setEndTime(Checker.getStringValue(item.getEndTime()));
                 return data;
             }

onemini-hospital-sdk/src/main/java/com/ywt/response/register/QueryOrderDetailResponseData.java

@@ -20,7 +20,7 @@ public class QueryOrderDetailResponseData implements IsvResponseData {
     private String userName;//就诊卡姓名
     private String cardNum;//就诊卡卡号
     private String queueNum;//就诊号/排队号
-    private Integer status;//预约单状态
+    private Integer status;//预约单状态 (0-待支付, 1-预约成功, 2-叫号中,7-已就诊,8-预期未就诊,9-取消预约)
     private String statusStr;//预约单状态
     private String amount;//支付金额
     private String payType;//支付方式