update 聊天室更新用户头像

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

@@ -119,8 +119,7 @@ public class PatientMonitorController {
 //        if(userBindClient.haveBindByPatientCode(resource.getPatientCode(),tenantId)){
 //            throw new CustomException("该病人已被看护");
 //        }
-        LoginUser loginUser = SecurityUtil.getLoginUser();
-        return R.success(patientClient.generateInviteCode(tenantId,resource.getPatientCode(),String.valueOf(loginUser.getId()),loginUser.getNickName(),resource.getManage()));
+        return R.success(patientClient.generateInviteCode(tenantId,resource.getPatientCode(),resource.getDoctorId(),resource.getDoctorName(),resource.getManage()));
     }
 
 

nb-service/app-doctor/src/main/java/com/nb/app/doctor/controller/vo/InviteCodeVo.java

@@ -23,4 +23,10 @@ public class InviteCodeVo {
     @ApiModelProperty(value = "监护位置",allowableValues = "0（院内管理） 1（居家管理）",required = true)
     @NotNull(message = "监护位置不能为空")
     private ClinicManageEnum manage;
+    @ApiModelProperty(value = "医生id",required = true)
+    @NotNull(message = "医生id不能为空")
+    private String doctorId;
+    @ApiModelProperty(value = "医生名称",required = true)
+    @NotNull(message = "医生名称不能为空")
+    private String doctorName;
 }

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

@@ -148,11 +148,7 @@ public class HisScriptSession {
         sendRequest(channelContext,request);
         result.onTimeout(()->{
             BusClinicEntity clinic = clinicService.recentClinicByPatientCode(hospitalId, patientCode);
-            if(clinic==null){
-                result.setResult(R.fail("拉取信息超时,请稍后再试"));
-            }else {
-                result.setResult(R.success(clinic));
-            }
+            result.setResult(R.success(clinic));
             //超时后不在响应
             hisRequestMap.remove(messageId);
         });
@@ -186,11 +182,7 @@ public class HisScriptSession {
         if(!online){
             BusPatientEntity patient = patientService.getOneByHospitalAndPatientCode(hospitalId, patientCode);
             BusClinicEntity clinic = clinicService.getById(patient.getClinicId());
-            if(clinic==null){
-                result.setResult(R.fail("医院不在线,拉取信息失败"));
-            }else {
-                result.setResult(R.success(clinic));
-            }
+            result.setResult(R.success(clinic));
             return result;
         }
         String messageId = IdWorker.getIdStr();
@@ -208,11 +200,7 @@ public class HisScriptSession {
             if(needResult){
                 BusPatientEntity patient = patientService.getOneByHospitalAndPatientCode(hospitalId, patientCode);
                 BusClinicEntity clinic = clinicService.getById(patient.getClinicId());
-                if(clinic==null){
-                    result.setResult(R.fail("该住院号不存在"));
-                }else {
-                    result.setResult(R.success(clinic));
-                }
+                result.setResult(R.success(clinic));
             }
             hisRequestMap.remove(messageId);
         });