fix 修改挂号订单列表

src/main/java/com/ywt/mg/params/registeredOrder/RegisteredOrderListRequest.java

@@ -67,6 +67,9 @@ public class RegisteredOrderListRequest extends PageRequest implements Serializa
     @ApiModelProperty(value = "支付流水号")
     private String paymentno;
 
+    @ApiModelProperty(value = "支付渠道")
+    private String paymentChannel;
+
     public String getOrderno() {
         return orderno;
     }
@@ -218,4 +221,12 @@ public class RegisteredOrderListRequest extends PageRequest implements Serializa
     public void setPaymentno(String paymentno) {
         this.paymentno = paymentno;
     }
+
+    public String getPaymentChannel() {
+        return paymentChannel;
+    }
+
+    public void setPaymentChannel(String paymentChannel) {
+        this.paymentChannel = paymentChannel;
+    }
 }

src/main/java/com/ywt/mg/services/RegisteredOrderService.java

@@ -317,6 +317,11 @@ public class RegisteredOrderService {
                 whereSql += " and ( payment_no like ?)";
                 paramList.add("%" + paymentno.trim() + "%");
             }
+            String paymentChannel = request.getPaymentChannel();
+            if (!Checker.isNull(paymentChannel)) {
+                whereSql += " and ( payment_channel =  ?  )";
+                paramList.add(Integer.parseInt(paymentChannel));
+            }
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -335,6 +340,7 @@ public class RegisteredOrderService {
             String col0 = "订单号";
             String col1 = "支付流水号";
             String col2 = "交易流水号";
+            String col2_1 = "支付渠道";
             String col3 = "患者姓名";
             String col4 = "患者手机号";
             String col5 = "诊疗卡";
@@ -349,10 +355,10 @@ public class RegisteredOrderService {
             String col14 = "下单时间";
             String col15 = "备注";
 
-            String[] columns = new String[]{col0, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10,
+            String[] columns = new String[]{col0, col1, col2, col2_1, col3, col4, col5, col6, col7, col8, col9, col10,
                     col11, col12, col13, col14, col15};
             if (hosp > 0) {
-                columns = new String[]{col0, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10,
+                columns = new String[]{col0, col1, col2, col2_1, col3, col4, col5, col6, col7, col8, col9, col10,
                         col11};
             }
             List<RegisteredOrder> registeredOrderList = queryRegisteredOrderList(request);
@@ -389,10 +395,12 @@ public class RegisteredOrderService {
                         cardNo = Checker.getStringValue(medicalCard.getCardNo());
                     }
                     String transactionId = orderPaymentService.getTransactionIdByOrderId(orderPaymentList, Checker.getIntegerValue(p.getOrderId()));
+                    String paymentChannel = PaymentChannelEnum.getDisplayName(Checker.getIntegerValue(p.getPaymentChannel()));
                     if (hosp > 0) {
                         map.getStringListSafely(col0).add(p.getOrderNo());
                         map.getStringListSafely(col1).add(p.getPaymentNo());
                         map.getStringListSafely(col2).add(transactionId);
+                        map.getStringListSafely(col2_1).add(paymentChannel);
                         map.getStringListSafely(col3).add(p.getPatientName());
                         map.getStringListSafely(col4).add(patientMobile);
                         map.getStringListSafely(col5).add(cardNo);
@@ -410,6 +418,7 @@ public class RegisteredOrderService {
                         map.getStringListSafely(col0).add(p.getOrderNo());
                         map.getStringListSafely(col1).add(p.getPaymentNo());
                         map.getStringListSafely(col2).add(transactionId);
+                        map.getStringListSafely(col2_1).add(paymentChannel);
                         map.getStringListSafely(col3).add(p.getPatientName());
                         map.getStringListSafely(col4).add(patientMobile);
                         map.getStringListSafely(col5).add(cardNo);