diff --git a/src/main/java/com/docus/server/mzzyy/job/MzZyyReportCollectJob.java b/src/main/java/com/docus/server/mzzyy/job/MzZyyReportCollectJob.java index cfb2482..da54e8a 100644 --- a/src/main/java/com/docus/server/mzzyy/job/MzZyyReportCollectJob.java +++ b/src/main/java/com/docus/server/mzzyy/job/MzZyyReportCollectJob.java @@ -97,16 +97,23 @@ public class MzZyyReportCollectJob { List httpUrls = new ArrayList<>(); int i = 1; for (MzZyyTestDto testFormPdf : testFormPdfs) { - MzZyyLisType lisType = MzZyyLisType.getLisType(testFormPdf.getType()); - List base64Files = mzZyyLisService.exportTestFormPdf(lisType, testFormPdf.getMachineId(), testFormPdf.getSampleId(), testFormPdf.getTestDate()); - for (MzZyyLisExportDto base64File : base64Files) { - String filePath = fileDirPath + File.separator + i + "." + base64File.getType().toLowerCase(Locale.ROOT); - String httpUrl = "http://127.0.0.1:9010/lis/" + formatDate + "/" + patientId + "/" + i + "." + base64File.getType().toLowerCase(Locale.ROOT); - String base64 = base64File.getBase64(); - byte[] decode = Base64.getDecoder().decode(base64); - FileUtil.writeBytes(decode, filePath); - httpUrls.add(httpUrl); - i++; + try { + MzZyyLisType lisType = MzZyyLisType.getLisType(testFormPdf.getType()); + List base64Files = mzZyyLisService.exportTestFormPdf(lisType, testFormPdf.getMachineId(), testFormPdf.getSampleId(), testFormPdf.getTestDate()); + for (MzZyyLisExportDto base64File : base64Files) { + String filePath = fileDirPath + File.separator + i + "." + base64File.getType().toLowerCase(Locale.ROOT); + String httpUrl = "http://127.0.0.1:9010/lis/" + formatDate + "/" + patientId + "/" + i + "." + base64File.getType().toLowerCase(Locale.ROOT); + String base64 = base64File.getBase64(); + byte[] decode = Base64.getDecoder().decode(base64); + FileUtil.writeBytes(decode, filePath); + httpUrls.add(httpUrl); + i++; + } + } catch (Exception ex) { + log.error("梅州中医院Lis采集,住院号:" + inpatientNo + ",住院流水号:" + jzh + ",type=" + testFormPdf.getType() + + ",machineId=" + testFormPdf.getMachineId() + ",sampleId=" + testFormPdf.getSampleId() + ",testDate=" + testFormPdf.getTestDate() + + ",采集base64出现错误," + ex.getMessage(), ex); + return; } } log.info("住院号:{},住院流水号:{},采集了 {} 份文件。", inpatientNo, jzh, httpUrls.size());