调整进度条

src/main/java/thyyxxk/webserver/service/medicalinsurance/SetlListUpldService.java

@@ -425,17 +425,16 @@ public class SetlListUpldService {
         }
         for (int i = 0; i < param.size(); i++) {
             SiSetlinfoTemp siPatInfo = param.get(i);
-            int percentage = makePercentage(i + 1, param.size());
             try {
                 ResultVo<String> resultVo = upldSetlList(siPatInfo.getPatNo(), siPatInfo.getTimes(), siPatInfo.getLedgerSn());
                 upldSetlErrorMessage(siPatInfo.getPatNo(), siPatInfo.getTimes(), siPatInfo.getLedgerSn(),
-                        resultVo.getMessage(), resultVo.getCode() == 200 ? 0 : 1, percentage, siPatInfo.getOutDeptName(),
+                        resultVo.getMessage(), resultVo.getCode() == 200 ? 0 : 1, i + 1, param.size(), siPatInfo.getOutDeptName(),
                         siPatInfo.getPsnName(), siPatInfo.getReferPhysicianName());
             } catch (Exception e) {
                 log.info("批量上传结算单错误：{}", JSON.toJSONString(e));
                 e.printStackTrace();
                 upldSetlErrorMessage(siPatInfo.getPatNo(), siPatInfo.getTimes(), siPatInfo.getLedgerSn(),
-                        e.getMessage(), 2, percentage, siPatInfo.getOutDeptName(), siPatInfo.getPsnName(), siPatInfo.getReferPhysicianName());
+                        e.getMessage(), 2, i + 1, param.size(), siPatInfo.getOutDeptName(), siPatInfo.getPsnName(), siPatInfo.getReferPhysicianName());
             }
         }
         return ResultVoUtil.success();
@@ -467,7 +466,7 @@ public class SetlListUpldService {
      * @param meg 错误消息
      */
     public void upldSetlErrorMessage(String patNo, Integer times, Integer ledgerSn, String meg,
-                                     int type, int percentage, String outDeptName, String psnName, String referPhysicianName) {
+                                     int type, int index, int total, String outDeptName, String psnName, String referPhysicianName) {
         JSONObject obj = new JSONObject();
         obj.put("name", "jdtMessage");
         obj.put("psnName#患者姓名|1", psnName);
@@ -478,7 +477,9 @@ public class SetlListUpldService {
         obj.put("outDeptName#出院科室|6", outDeptName);
         obj.put("referPhysicianName#管床医生|7", referPhysicianName);
         obj.put("type#类型|8", type);
-        obj.put("percentage", percentage);
+        obj.put("total", total);
+        obj.put("index", index);
+        obj.put("jdtType", "upload");
         obj.put("title", String.format("住院号：【%s】，住院次数：【%d】，账页号：【%d】。", patNo, times, ledgerSn));
         String message = obj.toJSONString();
         WebSocketServer.sendMessageByUserCode(TokenUtil.getTokenUserId(), message);
@@ -684,13 +685,13 @@ public class SetlListUpldService {
         List<SiSetlinfoTemp> list = new ArrayList<>();
         JSONObject obj = new JSONObject();
         obj.put("name", "jdtMessage");
-        obj.put("jdtType", "pureProgress");
+        obj.put("jdtType", "download");
         obj.put("jdtTitle", "导出Excel");
         obj.put("total", param.getTotal());
         for (int i = 0; i < currentPage; i++) {
             param.setCurrentPage(i + 1);
             list.addAll(huoQuJieSuanRenYuan(param).getData().getRecords());
-            obj.put("size", list.size());
+            obj.put("index", list.size());
             WebSocketServer.sendMessageByUserCode(TokenUtil.getTokenUserId(), obj.toString());
         }
         String[] title = {"姓名", "审核状态", "申报类型", "出院科室", "住院号/门诊号", "性别", "住院天数", "诊断编码", "诊断名称", "治疗方式", "总费用",