From 3df646a1f92a630b5e58938dc13a44726c21ea08 Mon Sep 17 00:00:00 2001
From: xuhaoxiang <1216720373@qq.com>
Date: Fri, 9 Jul 2021 09:47:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=9D=A1=E4=BB=B6=EF=BC=8C=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E9=87=8C=E9=85=8D=E7=BD=AE=E7=9A=84=E7=A7=91=E5=AE=A4?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=8B=E8=BD=BD=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ann/service/impl/QueueService.java  | 16 +++++++++++++++-
 src/main/resources/application.yml               |  3 +++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/ann/service/impl/QueueService.java b/src/main/java/com/ann/service/impl/QueueService.java
index a4d4268..78fdc2a 100644
--- a/src/main/java/com/ann/service/impl/QueueService.java
+++ b/src/main/java/com/ann/service/impl/QueueService.java
@@ -222,7 +222,21 @@ public class QueueService {
                                             }
                                         }
                                         File pdfFile =null;
-                                        if(!Objects.equals(archiveMaster.getDeptName(),deptName)) {
+                                        boolean flag=true;
+                                        if(deptName.indexOf(",")!=-1){
+                                            String[] deptList=deptName.split(",");
+                                            for(int i=0;i<deptList.length;i++){
+                                                if(archiveMaster.getDeptName().equals(deptList[i])){
+                                                    flag=false;
+                                                    break;
+                                                }
+                                            }
+                                        }else{
+                                            if(archiveMaster.getDeptName().equals(deptName)){
+                                                flag=false;
+                                            }
+                                        }
+                                        if(flag) {
                                              pdfFile = FileUtils.createFile("pdfs", messageDto.getInpNo(), messageDto.getVisitId(), archiveDetail.getId(), tempPath);
                                         }
                                         if (pdfFile != null) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 14a7805..2709bce 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -65,3 +65,6 @@ cancelSignContent: <REQUEST>
   </REQUEST>
 server:
   port: 1111
+dept:
+  #肾病内科
+  deptName: 1040100