|
|
|
@ -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;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|