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