From 5e8da1923824b5d916eed82710c46949c2d97a1d Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Mon, 17 May 2021 19:37:01 +0800 Subject: [PATCH] =?UTF-8?q?20210517=E5=AF=BC=E5=87=BApdf=E7=9A=84bugv1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/ht/service/PatientReportService.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java b/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java index 68113a96..0472d2b8 100644 --- a/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java +++ b/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java @@ -469,13 +469,7 @@ public class PatientReportService implements IPatientReportService { List scores = adminQueryReport.getScores(); if (CollectionUtil.isNotEmpty(scores)) { - Iterator iterator = scores.iterator(); - while (iterator.hasNext()) { - PatientReportDto.Score next = iterator.next(); - if (next.getStart() == null && next.getEnd() == null) { - iterator.remove(); - } - } + scores.removeIf(next -> next.getStart() == null && next.getEnd() == null); } List reportNames = htPatientReportDao.queryAllReports(adminQueryReport); @@ -681,7 +675,7 @@ public class PatientReportService implements IPatientReportService { initAnalyseTitle(rows, total); if (CollectionUtil.isEmpty(analyses)) { - Workbook workbook = new XSSFWorkbook();; + Workbook workbook = new XSSFWorkbook(); PoiUtil.exportWB("报告单详情", rows, workbook); return workbook; } @@ -700,7 +694,7 @@ public class PatientReportService implements IPatientReportService { - Workbook workbook = new XSSFWorkbook();; + Workbook workbook = new XSSFWorkbook(); PoiUtil.exportWB("报告单详情", rows, workbook); return workbook; } @@ -1030,7 +1024,7 @@ public class PatientReportService implements IPatientReportService { int titleSpan = 2; PdfUtil.Cell initWordCell = addCell(row, "初步印象", titleSpan, 2); initWordCell.setHeight(PdfUtil.Cell.defaultHeight * 2); - String initialImpression = reportPatient.getInitialImpression(); +// String initialImpression = reportPatient.getInitialImpression(); PdfUtil.Cell initImplCell = addCell(row, "", colNum - titleSpan, 2); initImplCell.setHeight(PdfUtil.Cell.defaultHeight * 2); initImplCell.setBorderRight(1); @@ -1039,6 +1033,8 @@ public class PatientReportService implements IPatientReportService { PdfUtil.Row tempRow = new PdfUtil.Row(); PdfUtil.Cell cell = addCell(tempRow, "仅供临床医生参考。", colNum, 1); + tempRow.addCell(cell); + content.add(tempRow); initLast(content, colNum); return scores; }