Parcourir la source

add 聊天室消息增加时间戳

18339543638 il y a 3 ans
Parent
commit
0d46f59dd8

+ 4 - 4
nb-service-api/app-assistant-api/src/main/java/com/nb/app/assistant/api/entity/AssistantUserBindEntity.java

@@ -55,6 +55,10 @@ public class AssistantUserBindEntity extends GenericEntity<String> {
     @ApiModelProperty(value = "医生id",required = true)
     private String doctorId;
 
+    @ApiModelProperty(value = "医生名称",required = true)
+//    @TableField(exist = false)
+    private String doctorName;
+
     @ApiModelProperty(value = "医院id",required = true)
     private String tenantId;
 
@@ -79,10 +83,6 @@ public class AssistantUserBindEntity extends GenericEntity<String> {
     @ApiModelProperty("医生拒绝理由")
     private String refuseReason;
 
-    @ApiModelProperty(hidden = true)
-    @TableField(exist = false)
-    private String doctorName;
-
     @ApiModelProperty(hidden = true)
     @JsonIgnoreProperties
     private String inviteCode;

+ 12 - 0
nb-service/app-assistant/src/main/java/com/nb/app/assistant/service/dto/AssistPatientResult.java

@@ -1,10 +1,13 @@
 package com.nb.app.assistant.service.dto;
 
+import com.nb.app.assistant.api.enums.BindEnum;
 import com.nb.core.enums.SexEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author lifang
  * @version 1.0.0
@@ -36,6 +39,9 @@ public class AssistPatientResult {
     @ApiModelProperty(value = "是否为默认看护")
     private boolean default_;
 
+    @ApiModelProperty(value = "医生名称",required = true)
+    private String doctorName;
+
     @ApiModelProperty(value = "医生id",required = true)
     private String doctorId;
 
@@ -44,4 +50,10 @@ public class AssistPatientResult {
 
     @ApiModelProperty(value = "医院名称",required = true)
     private String tenantName;
+
+    @ApiModelProperty(value = "当前状态")
+    private BindEnum status;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
 }

+ 6 - 0
nb-service/app-doctor/src/main/java/com/nb/app/doctor/controller/PatientMonitorController.java

@@ -77,6 +77,12 @@ public class PatientMonitorController {
         return R.success(results);
     }
 
+    @ApiOperation("判断看护人是否在线")
+    @PostMapping("/online/{assistId}")
+    public R<Boolean> isOnline(@PathVariable("assistId")String assistId){
+        return R.success(lifeCycleManage.isOnline(assistId));
+    }
+
     @PostMapping("/monitor/{patientId}")
     @ApiOperation(value = "查看病人当前监控详情")
     public R<PatientMonitorDetailResult> monitorPatient(@PathVariable("patientId") String patientId) {