Merge branch 'dev' into nb-pc-rabbitmq

# Conflicts:
#	nb-service/app-assistant/src/main/java/com/nb/app/assistant/service/LocalAssistantUserBindService.java
#	nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusPatientService.java

nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/his/HisScriptSession.java

@@ -119,7 +119,7 @@ public class HisScriptSession {
      */
     public  DeferredResult<R<BusClinicEntity>>  syncGetPatientInfo(String patientCode, long timeout, TimeUnit unit,boolean ignoreOnline){
         boolean online = isOnline();
-        if (!ignoreOnline&&online) {
+        if (!ignoreOnline&&!online) {
             log.warn("医院【{}】不在线，拉取【{}】信息失败,拉取方式【同步】",hospitalId,patientCode);
             throw new CustomException("医院不在线,拉取信息失败");
         }