From 70e209e1561d225d45ec6241d85cd994c6219fe5 Mon Sep 17 00:00:00 2001
From: xuhaoxiang <1216720373@qq.com>
Date: Tue, 3 Aug 2021 15:07:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=A7=91=E5=AE=A4=EF=BC=8C=E6=82=A3=E8=80=85=E5=87=BA=E5=85=A5?=
 =?UTF-8?q?=E9=99=A2=E7=A7=91=E5=AE=A4=E6=9C=89=E9=85=8D=E7=BD=AE=E9=A1=B9?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=9A=84=E7=A7=91=E5=AE=A4=EF=BC=8C=E5=8F=AA?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=AE=B0=E5=BD=95=EF=BC=8C=E4=B8=8D=E5=AD=98?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../interfaces/impl/HomepageDictionaryImpl.java    | 14 +++++++++-----
 src/main/resources/application.yml                 |  2 ++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java b/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java
index f355554..edd4943 100644
--- a/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java
+++ b/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java
@@ -118,13 +118,15 @@ public class HomepageDictionaryImpl implements HomepageDictionary {
                             //单个部门
                         } else {
                             if(StringUtils.isNotBlank(deptAdmissionTo)) {
-                                if (deptNameOut.equals(deptName)) {
+                                if (deptAdmissionTo.equals(deptName)) {
                                     flagForFlag = false;
+                                    break ln;
                                 }
                             }
                             if(StringUtils.isNotBlank(deptNameOut)) {
-                                if (deptAdmissionTo.equals(deptName)) {
+                                if (deptNameOut.equals(deptName)) {
                                     flagForFlag = false;
+                                    break ln;
                                 }
                             }
                         }
@@ -203,7 +205,7 @@ public class HomepageDictionaryImpl implements HomepageDictionary {
             long endTime = System.currentTimeMillis();
             messageLog.setValue(masterId,outContent, result, messageDto == null ? "" : JSON.toJSONString(messageDto), xmlCreateTime, (endTime - startTime), new Date(), type,remark);
             messageService.save(messageLog);
-            if( remark == null && flag){
+            if( remark == null && flag&&flagForFlag){
                 messageSubordinateService.save(new MessageSubordinate(messageLog.getId(), patientMainStr, JSON.toJSONString(messageLog)));
             }
         }catch (Exception e){
@@ -263,13 +265,15 @@ public class HomepageDictionaryImpl implements HomepageDictionary {
                             //单个部门
                         } else {
                             if(StringUtils.isNotBlank(deptAdmissionTo)) {
-                                if (deptNameOut.equals(deptName)) {
+                                if (deptAdmissionTo.equals(deptName)) {
                                     flagForFlag = false;
+                                    break ln;
                                 }
                             }
                             if(StringUtils.isNotBlank(deptNameOut)) {
-                                if (deptAdmissionTo.equals(deptName)) {
+                                if (deptNameOut.equals(deptName)) {
                                     flagForFlag = false;
+                                    break ln;
                                 }
                             }
                         }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d5ac93e..1694b2c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -51,4 +51,6 @@ file:
   imagePath: Z:/images/docus_scanningfile_20201216/
   scanningFilePath: D:\\1\scanningFile.properties
   errorPath: D:/logs/errorMessage/
+dept:
+  deptName: 1070100