|
|
|
|
@ -295,7 +295,7 @@ public class BatchExportServiceImpl implements BatchExportService {
|
|
|
|
|
|
|
|
|
|
public Boolean imageToPdf1(List<ExportDetailsVo> scanPathVos, ByteArrayOutputStream bos, EmrPdfWaterSet pdfWaterSet) {
|
|
|
|
|
//ByteArrayOutputStream bos = null;
|
|
|
|
|
FileOutputStream fileOutputStream = null;
|
|
|
|
|
//FileOutputStream fileOutputStream = null;
|
|
|
|
|
PdfWriter writer = null;
|
|
|
|
|
try {
|
|
|
|
|
//bos = new ByteArrayOutputStream();
|
|
|
|
|
@ -380,22 +380,20 @@ public class BatchExportServiceImpl implements BatchExportService {
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
return false;
|
|
|
|
|
} finally {
|
|
|
|
|
//try {
|
|
|
|
|
try {
|
|
|
|
|
if (writer != null) {
|
|
|
|
|
writer.close();
|
|
|
|
|
}
|
|
|
|
|
/*if (fileOutputStream != null) {
|
|
|
|
|
fileOutputStream.close();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}*/
|
|
|
|
|
if (bos != null) {
|
|
|
|
|
bos.flush();
|
|
|
|
|
bos.close();
|
|
|
|
|
}*/
|
|
|
|
|
|
|
|
|
|
/*} catch (IOException e) {
|
|
|
|
|
}
|
|
|
|
|
} catch (IOException e) {
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
}*/
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|