18339543638 3 лет назад
Родитель
Сommit
9dcc5c5287

+ 0 - 1
nb-im/src/main/java/com/nb/im/listener/ConsultMsgListener.java

@@ -10,7 +10,6 @@ import com.nb.im.entity.ImRoomUserEntity;
 import com.nb.im.enums.ImStatusEnum;
 import com.nb.im.room.ImRoomOperator;
 import com.nb.im.room.ImRoomOperatorManager;
-import com.nb.im.service.LocalImMsgService;
 import com.nb.im.service.LocalImRoomService;
 import com.nb.im.service.LocalImRoomUserService;
 import com.nb.im.utils.ImUtils;

+ 9 - 7
nb-service/app-msg/src/main/java/com/nb/app/msg/entity/AppConsultEntity.java

@@ -29,11 +29,11 @@ import javax.validation.constraints.NotNull;
 @NoArgsConstructor
 public class AppConsultEntity  extends GenericEntity<String> {
     @ApiModelProperty(value = "病人id",required = true)
-    @NotNull(message = "病人id不能为空")
+    @NotNull(message = "病人id不能为空",groups = Insert.class)
     private String patientId;
 
     @ApiModelProperty(value = "住院号",required = true)
-    @NotNull(message = "住院号不能为空")
+    @NotNull(message = "住院号不能为空",groups = Insert.class)
     private String patientCode;
 
     @ApiModelProperty("病人性别")
@@ -45,19 +45,21 @@ public class AppConsultEntity  extends GenericEntity<String> {
     @ApiModelProperty("病人年龄")
     private Integer patientAge;
 
-    @ApiModelProperty(value = "咨询医生id",readOnly = true)
+    @ApiModelProperty(value = "咨询医生id")
+    @NotNull(message = "咨询医生id不能为空",groups = Insert.class)
     private String doctorId;
 
     @ApiModelProperty(value = "问题类型",required = true)
-    @NotNull(message = "问题类型不能为空")
+    @NotNull(message = "问题类型不能为空",groups = Insert.class)
     private String type;
 
     @ApiModelProperty(value = "内容描述,最多255个字节",required = true)
-    @NotNull(message = "内容描述不能为空")
+    @NotNull(message = "内容描述不能为空",groups = Insert.class)
     private String content;
 
-    @ApiModelProperty(value = "聊天室id",readOnly = true)
-    private String imRoomId;
+    @ApiModelProperty(value = "看护人id")
+    @NotNull(message = "看护人id不能为空",groups = Insert.class)
+    private String assistId;
 
     @ApiModelProperty("相关资料")
     @TableField(typeHandler = StringListTypeHandler.class)

+ 1 - 1
nb-service/app-msg/src/main/java/com/nb/app/msg/entity/AppMsgEntity.java

@@ -86,7 +86,7 @@ public class AppMsgEntity  extends GenericEntity<String> {
         }
         switch (msgType){
             case CONSUL:
-                return getSenderName()+"发起疼痛:"+getExtend()+"咨询";
+                return getSenderName()+"发起"+getMsgType()+"咨询";
             case REGISTER:
                 return "您已注册成功,默认密码为A123456,请及时更改";
             case PAIN_CALL: