merge 合并hotfix分支，解决冲突

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

@@ -315,7 +315,7 @@ public class NatOrderService {
             }
             int size = natOrderList.size();
             List<ExcelCollectPojo> itemList = new ArrayList<>();
-            downloadRecordService.createFileAndUploadOssAndSaveToDataBase(fileName, downloadRecordId, map, itemList);
+            downloadRecordService.createFileAndUploadOssAndSaveToDataBase(fileName, downloadRecordId, map, itemList, size);
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -953,7 +953,7 @@ public class PrescriptionServices {
             }
             int size = prescriptionInfoList.size();
             List<ExcelCollectPojo> itemList = new ArrayList<>();
-            downloadRecordService.createFileAndUploadOssAndSaveToDataBase(fileName, downloadRecordId, map, itemList);
+            downloadRecordService.createFileAndUploadOssAndSaveToDataBase(fileName, downloadRecordId, map, itemList, size);
         } catch (Exception e) {
             e.printStackTrace();
         }