fix 修改接口，调整统计数据

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

@@ -67,7 +67,7 @@ public class NatOrderService {
             paramList.add(paymentCode);
         }
 
-        String patientName =  Checker.getStringValue(request.getPatientName());
+        String patientName = Checker.getStringValue(request.getPatientName());
         if (!Checker.isNull(patientName)) {
             whereSql += " and ( patient_name like ?)";
             paramList.add(patientName + "%");
@@ -165,12 +165,12 @@ public class NatOrderService {
         String paymentEndTime = Checker.getStringValue(request.getPaymentEndTime());
         Map<String, Object> map = sqlHelper.timeQuerySql(whereSql, paramList, "pay_time", paymentStartTime, paymentEndTime);
 
-        String refundStartTime =  Checker.getStringValue(request.getRefundStartTime());
-        String refundEndTime =  Checker.getStringValue(request.getRefundEndTime());
+        String refundStartTime = Checker.getStringValue(request.getRefundStartTime());
+        String refundEndTime = Checker.getStringValue(request.getRefundEndTime());
         map = sqlHelper.timeQuerySql(map, "refund_time", refundStartTime, refundEndTime);
 
-        String confirmStartTime =  Checker.getStringValue(request.getConfirmStartTime());
-        String confirmEndTime =  Checker.getStringValue(request.getConfirmEndTime());
+        String confirmStartTime = Checker.getStringValue(request.getConfirmStartTime());
+        String confirmEndTime = Checker.getStringValue(request.getConfirmEndTime());
         map = sqlHelper.timeQuerySql(map, "confirm_time", confirmStartTime, confirmEndTime, FormatUtil.FORMAT_DATE_SECOND);
         return map;
     }
@@ -246,13 +246,11 @@ public class NatOrderService {
     }
 
     private List<ExcelCollectPojo> getStatisticsData(int size, int payTotal, int refundTotal, List<NatOrder> itemList) {
-
-
         int startRows = size + 3;
         int startColumn = 3;
 
         List<ExcelCollectPojo> customExcelItemList = new ArrayList<>();
-        customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows , new String[]{"支付总额", FormatUtil.intShrink100ToStr(payTotal)}));
+        customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows, new String[]{"支付总额", FormatUtil.intShrink100ToStr(payTotal)}));
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows, new String[]{"退款总额", FormatUtil.intShrink100ToStr(refundTotal)}));
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{"实际支付金额", FormatUtil.intShrink100ToStr(payTotal - refundTotal)}));
 
@@ -305,8 +303,8 @@ public class NatOrderService {
             String[] columns = new String[]{col0, col1, col2, col3, col4, col5, col6};
             List<NatOrder> natOrderList = queryNatOrderList(request);
             ExcelDataMap map = new ExcelDataMap(columns);
-            int payTotal = 0, refundTotal = 0, realityTotal = 0;
-            if(!Checker.isNone(natOrderList)){
+            int payTotal = 0, refundTotal = 0, realityTotal = 0, rowSize = 0;
+            if (!Checker.isNone(natOrderList)) {
                 List<OrderPayment> orderPaymentList = orderPaymentService.getOrderPaymentListByNatOrderList(natOrderList);
                 // 得到退款的记录日志（需要从 refund_log 获取 refund_id 字段）
                 List<RefundLog> refundLogList = refundLogService.getRefundLogListByNatOrderList(natOrderList);
@@ -348,7 +346,7 @@ public class NatOrderService {
                                 payTotal += Checker.getIntegerValue(p.getAmount());
                             }
                             map.getStringListSafely(col6).add(paymentChannel);
-
+                            rowSize++;
                         }
                     }
                 }
@@ -386,12 +384,13 @@ public class NatOrderService {
                                 refundTotal += Checker.getIntegerValue(p.getAmount());
                             }
                             map.getStringListSafely(col6).add(paymentChannel);
+                            rowSize++;
                         }
                     }
                 }
             }
             int size = natOrderList.size();
-            List<ExcelCollectPojo> itemList = getStatisticsData(size, payTotal, refundTotal, natOrderList);
+            List<ExcelCollectPojo> itemList = getStatisticsData(rowSize, payTotal, refundTotal, natOrderList);
             downloadRecordService.createFileAndUploadOssAndSaveToDataBase(fileName, downloadRecordId, map, itemList, size);
         } catch (Exception e) {
             e.printStackTrace();