18339543638 3 rokov pred
rodič
commit
0a25651430

+ 2 - 0
nb-service-api/app-assistant-api/src/main/java/com/nb/app/assistant/api/feign/result/AssistantUserResult.java

@@ -1,5 +1,6 @@
 package com.nb.app.assistant.api.feign.result;
 
+import com.nb.core.enums.SexEnum;
 import lombok.Data;
 
 /**
@@ -15,4 +16,5 @@ public class AssistantUserResult {
     private String nickname;
     private String avatar;
     private String phone;
+    private SexEnum sex;
 }

+ 3 - 0
nb-service/app-assistant/src/main/java/com/nb/app/assistant/entity/AssistantUserEntity.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.nb.core.entity.GenericEntity;
+import com.nb.core.enums.SexEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -41,4 +42,6 @@ public class AssistantUserEntity extends GenericEntity<String> {
     @Length(max = 32,message = "昵称不得超过32个字节",groups = {Insert.class,Update.class})
     private String nickname;
 
+    @ApiModelProperty(value = "性别")
+    private SexEnum sex;
 }

+ 1 - 1
nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/config/handler/AnalPoorDisappearHandler.java

@@ -46,7 +46,7 @@ public class AnalPoorDisappearHandler implements DelayMessageHandler {
         }
         String deviceId = source.getDeviceId();
         BusInfusionHistoryEntity infusionHistory = infusionHistoryService.getById(source.getInfusionId());
-        if(Boolean.TRUE.equals(infusionHistory.getFinished())){
+        if(infusionHistory==null||Boolean.TRUE.equals(infusionHistory.getFinished())){
             //输注已结束,无需再处理
             return;
         }