lihong 2 年之前
父节点
当前提交
0ffb7a2955
共有 1 个文件被更改,包括 4 次插入4 次删除
  1. 4 4
      src/main/java/thyyxxk/webserver/service/medicalinsurance/SetlListUpldService.java

+ 4 - 4
src/main/java/thyyxxk/webserver/service/medicalinsurance/SetlListUpldService.java

@@ -756,7 +756,7 @@ public class SetlListUpldService {
         List<AutoUploadBill> autoUploadBills = new ArrayList<>();
         for (int i = 0; i < param.size(); i++) {
             SiSetlinfoTemp siPatInfo = param.get(i);
-            AutoUploadBill autoUploadBill = getAutoUploadBillAndUpload(siPatInfo.getPatNo(),siPatInfo.getTimes(),siPatInfo.getLedgerSn(),siPatInfo.getSetlTime(),true,i+1,param.size(),siPatInfo);
+            AutoUploadBill autoUploadBill = getAutoUploadBillAndUpload(siPatInfo.getPatNo(),siPatInfo.getTimes(),siPatInfo.getLedgerSn(),siPatInfo.getSetlTime(),checkFlag,true,i+1,param.size(),siPatInfo);
             autoUploadBills.add(autoUploadBill);
         }
         autoUploadBillService.asyncSaveData(autoUploadBills);
@@ -777,7 +777,7 @@ public class SetlListUpldService {
            return;
         }
         List<AutoUploadBill> autoUploadBills = new ArrayList<>();
-        AutoUploadBill autoUploadBill = getAutoUploadBillAndUpload(patNo, times, ledgerSn, setTime,false,0,0,null);
+        AutoUploadBill autoUploadBill = getAutoUploadBillAndUpload(patNo, times, ledgerSn, setTime,false,false,0,0,null);
         autoUploadBills.add(autoUploadBill);
         autoUploadBillService.asyncSaveData(autoUploadBills);
         if(autoUploadBill.getFlag() == AutoUploadBill.FLAG.UPLOAD_FAIL.getCode()){
@@ -798,7 +798,7 @@ public class SetlListUpldService {
      * @param: siPatInfo
      * @return: thyyxxk.webserver.entity.querydata.AutoUploadBill
      **/
-    public AutoUploadBill getAutoUploadBillAndUpload(String patNo, Integer times, Integer ledgerSn, Date setTime,boolean sendMessageFlag,int index,int size,SiSetlinfoTemp siPatInfo) {
+    public AutoUploadBill getAutoUploadBillAndUpload(String patNo, Integer times, Integer ledgerSn, Date setTime,boolean checkFlag,boolean sendMessageFlag,int index,int size,SiSetlinfoTemp siPatInfo) {
         AutoUploadBill autoUploadBill = new AutoUploadBill();
         try {
         String userId = TokenUtil.getTokenUserId();
@@ -812,7 +812,7 @@ public class SetlListUpldService {
         autoUploadBill.setCreatedDate(new Date());
         autoUploadBill.setUploadCode(userId);
         autoUploadBill.setUploadName(userName);
-        ResultVo<String> resultVo = upldSetlList(patNo, times, ledgerSn,false);
+        ResultVo<String> resultVo = upldSetlList(patNo, times, ledgerSn,checkFlag);
         autoUploadBill.setLogText(resultVo.getMessage());
         autoUploadBill.setFlag(resultVo.getCode() == 200 ? AutoUploadBill.FLAG.UPLOAD_SUCCESS.getCode():AutoUploadBill.FLAG.UPLOAD_FAIL.getCode());
         if(sendMessageFlag){