From 5ccc921b806bfddbdf8a773a27b45fcdfe11d161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=87=E5=AE=99=E7=9A=AE=E7=9A=AE=E5=A8=83?=
 <2964346877@qq.com>
Date: Mon, 6 May 2024 09:50:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E8=A5=BF=E7=BB=93=E5=90=88=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../busservice/impl/ZxjhBusinessServiceImpl.java   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/docus/server/message/busservice/impl/ZxjhBusinessServiceImpl.java b/src/main/java/com/docus/server/message/busservice/impl/ZxjhBusinessServiceImpl.java
index 9f33d01..552995a 100644
--- a/src/main/java/com/docus/server/message/busservice/impl/ZxjhBusinessServiceImpl.java
+++ b/src/main/java/com/docus/server/message/busservice/impl/ZxjhBusinessServiceImpl.java
@@ -95,7 +95,7 @@ public class ZxjhBusinessServiceImpl implements ZxjhBusinessService {
                 List<FileDto> fileDtos = getFileDtos(result);
                 log.info("同步病案主键:{}，jzh:{},文件数量:{}",patientId,jzh,fileDtos.size());
                 if(Func.isEmpty(fileDtos)){
-                    return;
+                    continue;
                 }
                 String downPath=config.getDownPath()+File.separator+patientId;
                 List<TScanAssort> tScanAssorts=new ArrayList<TScanAssort>();
@@ -325,18 +325,17 @@ public class ZxjhBusinessServiceImpl implements ZxjhBusinessService {
         }
         String path = uri.getPath();
         FTPClient ftpClient = new FTPClient();
+        OutputStream outputStream=null;
         try {
             ftpClient.connect(host, port);
             ftpClient.login(username, password);
             ftpClient.enterLocalPassiveMode();
 
             File localFile = new File(localFilePath);
-            OutputStream outputStream = new FileOutputStream(localFile);
+            outputStream = new FileOutputStream(localFile);
 
             ftpClient.retrieveFile(path, outputStream);
 
-            outputStream.close();
-
             int numberOfPages=0;
             // 判断文件类型并获取页数
             if (isPdf(localFilePath)) {
@@ -361,6 +360,9 @@ public class ZxjhBusinessServiceImpl implements ZxjhBusinessService {
                     log.error(ex.getMessage(),ex);
                 }
             }
+            if ( outputStream!=null){
+                outputStream.close();
+            }
         }
     }
 
@@ -379,8 +381,8 @@ public class ZxjhBusinessServiceImpl implements ZxjhBusinessService {
             PdfReader reader = new PdfReader(filePath);
             return reader.getNumberOfPages();
         } catch (Exception e) {
-            e.printStackTrace();
-            return 0;
+            log.info(e.getMessage(),e);
+            throw new BaseException("获取文件页码出错");
         }
     }
 }