Merge branch 'dev' into nb-pc-rabbitmq

nb-core/src/main/java/com/nb/core/annotation/Phone.java

@@ -27,7 +27,7 @@ import org.hibernate.validator.constraints.Length;
  * 
  */
 @ConstraintComposition(CompositionType.OR)
-@Pattern(regexp = "1[3|4|5|7|8][0-9]\\d{8}")
+@Pattern(regexp = "1[3|4|5|6|7|8|9][0-9]\\d{8}")
 @Null
 @Length(min = 0, max = 0)
 @Documented

nb-service/app-assistant/src/main/java/com/nb/app/assistant/controller/vo/ResetCaptchaVo.java

@@ -1,5 +1,6 @@
 package com.nb.app.assistant.controller.vo;
 
+import com.nb.core.annotation.Phone;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,6 +19,7 @@ import javax.validation.constraints.NotNull;
 public class ResetCaptchaVo {
 
     @ApiModelProperty("手机号")
+    @Phone
     @NotNull(message = "手机号不能为空")
     private String phone;
 

nb-service/app-assistant/src/main/java/com/nb/app/assistant/service/LocalAssistantUserBindService.java

@@ -173,6 +173,9 @@ public class LocalAssistantUserBindService extends BaseService<AssistantUserBind
     @Override
     public boolean handleBindResult(HandleBindResult source) {
         AssistantUserBindEntity userBind = this.findById(source.getBindId());
+        if(userBind==null){
+            throw new CustomException("该绑定关系不存在");
+        }
         Boolean isDefault=false;
         if(source.getAgree()){
             //判断是否重复绑定

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusPatientService.java

@@ -291,10 +291,7 @@ public class LocalBusPatientService extends BaseService<BusPatientMapper, BusPat
         patient.setId(existPatient.getId());
         this.updateById(patient);
         patientOperator.setClinicId(patient.getClinicId());
-
-        CompletableFuture.runAsync(() -> {
-            wsPublishUtils.publishPatientMonitor(originPatientInfo.getId(), patient.getTenantId());
-        });
+        wsPublishUtils.publishPatientMonitor(originPatientInfo.getId(), patient.getTenantId());
     }
 
     /**