fix 修复一些Bug

nb-im/src/main/java/com/nb/im/entity/ImRoomUserEntity.java

@@ -36,6 +36,9 @@ public class ImRoomUserEntity extends GenericEntity<String> {
     @ApiModelProperty(value = "参与人id",required = true)
     private String userId;
 
+    @ApiModelProperty(value = "参与人昵称")
+    private String nickname;
+
     @ApiModelProperty("已读消息数量")
     private int readCount;
 

nb-im/src/main/java/com/nb/im/listener/ConsultMsgListener.java

@@ -101,6 +101,7 @@ public class ConsultMsgListener {
         result.setImRoomId(source.getId());
         result.setTop(false);
         result.setUserId(msg.getReceiverId());
+        result.setNickname(msg.getReceiverName());
         roomUserService.save(result);
         return result;
     }

nb-im/src/main/java/com/nb/im/service/LocalImRoomService.java

@@ -92,8 +92,8 @@ public class LocalImRoomService extends BaseService<ImRoomMapper, ImRoomEntity,S
         //等待医生确认
         result.setStatus(source.getStatus());
         this.save(result);
-        chatRoomUserService.createRoomUser(result.getId(),source.getAssistId(),SponsorEnum.assist);
-        chatRoomUserService.createRoomUser(result.getId(),source.getDoctorId(),SponsorEnum.doctor);
+        chatRoomUserService.createRoomUser(result.getId(),source.getAssistId(),source.getDoctorNickname(),SponsorEnum.assist);
+        chatRoomUserService.createRoomUser(result.getId(),source.getDoctorId(),source.getDoctorNickname(),SponsorEnum.doctor);
         return result;
     }
 

nb-im/src/main/java/com/nb/im/service/LocalImRoomUserService.java

@@ -16,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @Service
 public class LocalImRoomUserService extends BaseService<ImRoomUserMapper, ImRoomUserEntity,String> {
+
     @Override
     public void validateBeforeSave(ImRoomUserEntity entity) {
         entity.setTop(false);
@@ -34,12 +35,12 @@ public class LocalImRoomUserService extends BaseService<ImRoomUserMapper, ImRoom
 
 
     @Transactional(rollbackFor = Exception.class)
-    public ImRoomUserEntity createRoomUser(String roomId, String partId, SponsorEnum partType){
+    public ImRoomUserEntity createRoomUser(String roomId, String partId, String partNickname, SponsorEnum partType){
         ImRoomUserEntity result = new ImRoomUserEntity();
         result.setImRoomId(roomId);
         result.setTop(false);
         result.setUserId(partId);
-//        result.setLastSendTime(new Date());
+        result.setNickname(partNickname);
         this.save(result);
         return result;
     }

nb-im/src/main/java/com/nb/im/service/dto/ImRoomDto.java

@@ -26,6 +26,10 @@ public class ImRoomDto {
     @NotNull(message = "医生id不能为空")
     private String doctorId;
 
+    @ApiModelProperty(value = "医生昵称",required = true)
+    @NotNull(message = "医生昵称不能为空")
+    private String doctorNickname;
+
     @ApiModelProperty(value = "看护人员id",required = true)
     @NotNull(message = "看护人员id不能为空")
     private String assistId;

nb-im/src/main/java/com/nb/im/service/dto/ImRoomResult.java

@@ -66,4 +66,10 @@ public class ImRoomResult implements Serializable {
 
     @ApiModelProperty("消息未读数量")
     private Integer unreadCount;
+
+    @ApiModelProperty(value = "医生昵称")
+    private String doctorNickname;
+
+    @ApiModelProperty(value = "医生id")
+    private String doctorId;
 }

nb-im/src/main/resources/mapper/im/ImRoomMapper.xml

@@ -16,6 +16,8 @@
         <result column="payload" property="payload"/>
         <result column="operation_type" property="operationType"/>
         <result column="msg_type" property="msgType"/>
+        <result column="doctorNickname" property="doctorNickname"/>
+        <result column="doctorId" property="doctorId"/>
     </resultMap>
 
 
@@ -33,7 +35,9 @@
         r.total_count as total_count,
         rm.payload as payload,
         rm.msg_type as msg_type,
-        rm.operation_type as operation_type
+        rm.operation_type as operation_type,
+        ru.nickname as doctorNickname,
+        ru.user_id as doctorId
         from
         (select * from im_room
         <where>
@@ -56,6 +60,13 @@
         ) as r
         left join (select * from im_msg) as rm
         on rm.id=r.last_msg_id
+        <if test="query.assistId != null">
+            left join (select * from im_room_user where
+            user_id != #{query.assistId}
+            ) as ru
+            on ru.im_room_id=r.id
+        </if>
+
         order by last_msg_time desc
     </select>
 

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

@@ -37,7 +37,7 @@ public class AssistantUserBindEntity extends GenericEntity<String> {
     @ApiModelProperty(value = "用户昵称",required = true)
     private String assistNickname;
 
-    @ApiModelProperty(value = "病人id",required = true)
+    @ApiModelProperty(value = "病人id,当手动填写数据时,为空;当邀请码填充时,不为空")
     private String patientId;
 
     @ApiModelProperty(value = "住院号",required = true)

nb-service-api/app-assistant-api/src/main/java/com/nb/app/assistant/api/enums/ApplyEnum.java

@@ -21,9 +21,9 @@ public enum  ApplyEnum   implements IEnum<Integer> {
     INVITE_CODE(1,"邀请码申请")
     ;
     @Getter
-    @ApiModelProperty("报警编码")
+    @ApiModelProperty("编码")
     private Integer value;
     @Getter
-    @ApiModelProperty("报警内容")
+    @ApiModelProperty("内容")
     private String text;
 }

nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/IPatientClient.java

@@ -87,4 +87,14 @@ public interface IPatientClient {
      * @return void
      */
     void delInviteCode(String inviteCode);
+
+    /**
+     * 描述: 根据住院号获取病人id
+     * @author lifang
+     * @date 2022/9/7 9:00
+     * @param tenantId
+     * @param patientCode
+     * @return String
+     */
+    String lookPatientId(String tenantId, String patientCode);
 }

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

@@ -88,6 +88,15 @@ public class PatientOperationController {
         if(ApplyEnum.INVITE_CODE.equals(vo.getApplyType())&& StrUtil.isEmpty(vo.getInviteCode())){
             throw new CustomException("邀请码不能为空");
         }
+        if(ApplyEnum.INVITE_CODE.equals(vo.getApplyType())&& StrUtil.isEmpty(vo.getPatientId())){
+            throw new CustomException("病人id不能为空");
+        }
+        if(StrUtil.isEmpty(vo.getPatientId())){
+            vo.setPatientId(patientClient.lookPatientId(vo.getTenantId(),vo.getPatientCode()));
+        }
+        if(vo.getManageType()==null){
+            vo.setManageType(patientClient.getManageType(vo.getPatientId()));
+        }
         judgePatient(vo.getPatientId());
         judgeUser();
         AssistantUserBindEntity resource = BeanUtil.copyProperties(vo, AssistantUserBindEntity.class);
@@ -103,7 +112,9 @@ public class PatientOperationController {
         }
         judgePatient(inviteCodeResult.getResult().getPatientId());
         judgeUser();
-        return R.success(BeanUtil.copyProperties(inviteCodeResult.getResult(), InviteCodePatientVo.class));
+        InviteCodePatientVo result = BeanUtil.copyProperties(inviteCodeResult.getResult(), InviteCodePatientVo.class);
+        result.setTenantId(inviteCodeResult.getTenantId());
+        return R.success(result);
     }
 
     @PostMapping("/call/{bindId}")

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

@@ -66,6 +66,12 @@ public class LocalAssistantUserBindService extends BaseService<AssistantUserBind
     @Override
     public boolean save(AssistantUserBindEntity entity) {
         String id = String.valueOf(SecurityUtil.getId());
+        if(StrUtil.isEmpty(entity.getPatientId())){
+            entity.setPatientId(patientClient.lookPatientId(entity.getTenantId(),entity.getPatientCode()));
+        }
+        if(entity.getManageType()==null){
+            entity.setManageType(patientClient.getManageType(entity.getPatientId()));
+        }
         AssistantUserResult currentUser = userService.getById(id);
         entity.setStatus(BindEnum.WAITING);
         entity.setAssistId(currentUser.getId());

nb-service/app-assistant/src/main/java/com/nb/app/assistant/utils/CaptchaUtil.java

@@ -29,7 +29,7 @@ public class CaptchaUtil {
 
         String result = codeCache.getWithTTLOnly(key);
         if (StrUtil.isNullOrUndefined(result)) {
-            result= RandomUtil.randomNumbers(4);
+            result= RandomUtil.randomNumbers(6);
             codeCache.put(key,result,5, TimeUnit.MINUTES);
         }
         return result;

nb-service/iot-service/src/main/java/com/nb/mq/entity/PcAnalgesicScoreEntity.java

@@ -0,0 +1,134 @@
+package com.nb.mq.entity;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *
+ * 
+ * </p>
+ *
+ * @author fanfan
+ * @since 2020-07-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("bus_analgesic_score")
+@ApiModel(value="BusAnalgesicScoreEntity对象", description="")
+public class PcAnalgesicScoreEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键",hidden = true)
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "病人ID")
+    public String patientId;
+
+    @ApiModelProperty(value = "泵号")
+    private String pumpCode;
+
+    @ApiModelProperty(value = "医院编码")
+    private String hospitalCode;
+
+    @ApiModelProperty(value = "住院号")
+    private String patientCode;
+
+    @ApiModelProperty(value = "疼痛评分静止")
+    private Integer statics;
+
+    @ApiModelProperty(value = "疼痛评分活动")
+    private Integer activity;
+
+    @ApiModelProperty(value = "镇静评分")
+    private Integer calm;
+
+    @ApiModelProperty(value = "左上肢")
+    private Integer leftArm;
+
+    @ApiModelProperty(value = "左下肢")
+    private Integer leftLeg;
+
+    @ApiModelProperty(value = "右上肢")
+    private Integer rightArm;
+
+    @ApiModelProperty(value = "右下肢")
+    private Integer rightLeg;
+
+    @ApiModelProperty(value = "恶心呕吐")
+    private Integer nauseaVomit;
+
+    @ApiModelProperty(value = "瘙痒")
+    private Integer itch;
+
+    @ApiModelProperty(value = "眩晕")
+    private Integer vertigo;
+
+    @ApiModelProperty(value = "咽喉疼痛")
+    private Integer soreThroat;
+
+    @ApiModelProperty(value = "尿潴留")
+    private Integer uroschesis;
+
+    @ApiModelProperty(value = "呼吸抑制")
+    private Integer breathDepression;
+
+    @ApiModelProperty(value = "声音嘶哑")
+    private Integer hoarseness;
+
+    @ApiModelProperty(value = "认知障碍")
+    private Integer cognitionObstacle;
+
+    @ApiModelProperty(value = "其他")
+    private String other;
+
+    @ApiModelProperty(value = "满意度")
+    private Integer satisfaction;
+
+    @ApiModelProperty(value = "创建时间",hidden = true)
+    private LocalDateTime gmtCreate;
+
+    @ApiModelProperty(value = "更新时间",hidden = true)
+    private LocalDateTime gmtModified;
+
+    @ApiModelProperty(value = "评价时间",hidden = true)
+    private LocalDateTime followDate;
+
+    @ApiModelProperty(value = "评价人")
+    private String creator;
+
+    @ApiModelProperty(value = "产品编码")
+    private String productCode;
+
+    @ApiModelProperty(value = "评价传输ID",hidden = true)
+    @TableField(exist = false)
+    private String analgesicScoreId;
+
+    @ApiModelProperty(value = "收缩压")
+    private String  SBP;
+
+
+    @ApiModelProperty(value = "舒张压")
+    private String  DBP;
+
+    @ApiModelProperty(value = "心率")
+    private String HR;
+
+    @ApiModelProperty(value = "呼吸频率")
+    private String RR;
+
+    @ApiModelProperty(value = "血氧饱和度")
+    private String SpO2;
+}

nb-service/iot-service/src/main/java/com/nb/mq/entity/PcPatientEntity.java

@@ -0,0 +1,107 @@
+package com.nb.mq.entity;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author fanfan
+ * @since 2020-07-03
+ */
+@Data
+public class PcPatientEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键/病人id")
+    private String patientId;
+
+    @ApiModelProperty(value = "医院Id")
+    private String hospitalCode;
+
+    @ApiModelProperty(value = "产品编号")
+    private String productCode;
+
+    @ApiModelProperty(value = "住院号")
+    private String patientCode;
+
+    @ApiModelProperty(value = "泵号")
+    private String pumpCode;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "性别")
+    private String sex;
+
+    @ApiModelProperty(value = "体重")
+    private String weight;
+
+    @ApiModelProperty(value = "身高")
+    private String height;
+
+    @ApiModelProperty(value = "年龄")
+    private Integer age;
+
+    @ApiModelProperty(value = "病区")
+    private String wardCode;
+
+    @ApiModelProperty(value = "床号")
+    private String bedCode;
+
+    @ApiModelProperty(value = "手术名称")
+    private String operationName;
+
+    @ApiModelProperty(value = "手术医生")
+    private String operationDoctor;
+
+    @ApiModelProperty(value = "ASA")
+    private String asa;
+
+    @ApiModelProperty(value = "镇痛方式")
+    private String easyMode;
+
+    @ApiModelProperty(value = "麻醉医生")
+    private String anesthesiaDoctor1;
+
+    @ApiModelProperty(value = "麻醉医生2")
+    private String anesthesiaDoctor2;
+
+    @ApiModelProperty(value = "麻醉方式")
+    private String anesthesiaMode;
+
+    @ApiModelProperty(value = "配置人员")
+    private String configPerson;
+
+    @ApiModelProperty(value = "配方")
+    private String formula;
+
+    @ApiModelProperty(value = "撤泵人")
+    private String undoPerson;
+
+    @ApiModelProperty(value = "销毁人")
+    private String destoryPerson;
+
+    @ApiModelProperty(value = "见证人")
+    private String witnessPerson;
+
+    @ApiModelProperty(value = "撤泵时间")
+    private LocalDateTime undoTime;
+
+    @ApiModelProperty(value = "盐值")
+    private String salt;
+
+    @ApiModelProperty(value = "剩余量处置")
+    private String remain;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "是否删除")
+    private Boolean isDelete;
+
+    private String bmi;
+}

nb-service/iot-service/src/main/java/com/nb/mq/entity/PcPumpEntity.java

@@ -0,0 +1,173 @@
+package com.nb.mq.entity;
+import java.math.BigDecimal;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonSetter;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author fanfan
+ * @since 2020-07-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class PcPumpEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @ApiModelProperty(value = "注液泵编码")
+    private String PumpCode;
+
+    @ApiModelProperty(value = "产品编码")
+    private String SysProduct_ID;
+
+    @ApiModelProperty(value = "医院编码")
+    private String SysHospital_ID;
+
+    @ApiModelProperty(value = "住院号")
+    private String PatientCode;
+
+    @ApiModelProperty(value = "剩余量")
+    private BigDecimal BalanceQuantity;
+
+    @ApiModelProperty(value = "持续量（智能泵当前流速）（脉冲泵KVO）")
+    private BigDecimal ContinueQuantity;
+
+    @ApiModelProperty(value = "自控量")
+    private BigDecimal SelfQuantity;
+
+    @ApiModelProperty(value = "锁定时间")
+    private Integer LockTime;
+
+    @ApiModelProperty(value = "已输入量")
+    private BigDecimal InputQuantity;
+
+    @ApiModelProperty(value = "有效次数")
+    private Integer TrueNum;
+
+    @ApiModelProperty(value = "无效次数")
+    private Integer FalseNum;
+
+    @ApiModelProperty(value = "极限量")
+    private BigDecimal MaxQuantity;
+
+    @ApiModelProperty(value = "首次量")
+    private Integer FirstQuantity;
+
+    @ApiModelProperty(value = "追加量")
+    private BigDecimal SingleQuantity;
+
+    @ApiModelProperty(value = "总量")
+    private Integer AllQuantity;
+
+    @ApiModelProperty(value = "总按次数")
+    private Integer AllCount;
+
+    @ApiModelProperty(value = "脉冲量")
+    private BigDecimal PulseQuantity;
+
+    @ApiModelProperty(value = "脉冲锁时")
+    private Integer PulseLockTime;
+
+    @ApiModelProperty(value = "首次量锁时")
+    private Integer FirstLockTime;
+
+    @ApiModelProperty(value = "上限")
+    private BigDecimal UpperLimit;
+
+    @ApiModelProperty(value = "下限")
+    private BigDecimal LowerLimit;
+
+    @ApiModelProperty(value = "自调比例")
+    private Integer CustomScate;
+
+    @ApiModelProperty(value = "加档有效次数")
+    private Integer AddTrueFrequency;
+
+    @ApiModelProperty(value = "镇痛泵运行状态")
+    private Integer RunState;
+
+    @ApiModelProperty(value = "镇痛泵状态BUF")
+    private Integer BUFState1;
+
+    @ApiModelProperty(value = "镇痛泵状态BUF")
+    private Integer BUFState2;
+
+    @ApiModelProperty(value = "镇痛泵状态BUF")
+    private Integer BUFState3;
+
+    @ApiModelProperty(value = "镇痛泵状态BUF")
+    @JsonSetter(value = "BUFState4")
+    private Integer BUFState4;
+
+    @ApiModelProperty(value = "镇痛泵状态BUF")
+    private Integer BUFState5;
+
+    @ApiModelProperty(value = "镇痛泵状态BUF")
+    private Integer BUFState6;
+
+    @ApiModelProperty(value = "镇痛泵状态BUF")
+    private Integer BUFState7;
+
+    @ApiModelProperty(value = "镇痛泵状态BUF")
+    private Integer BUFState8;
+
+    @ApiModelProperty(value = "镇痛泵状态BUF")
+    private Integer BUFState9;
+
+    @ApiModelProperty(value = "镇痛评分")
+    private Integer Score;
+
+    @ApiModelProperty(value = "加档周期")
+    private BigDecimal FilingCycle;
+
+    @ApiModelProperty(value = "减档周期")
+    private BigDecimal ReductionPeriod;
+
+    @ApiModelProperty(value = "呼叫标记")
+    private Integer CallFlag;
+
+    @ApiModelProperty(value = "开始时间")
+    private Date StartTime;
+
+    @ApiModelProperty(value = "是否可见")
+    private Boolean Visible;
+
+    @ApiModelProperty(value = "状态标记")
+    private Integer StateFlag;
+
+    @ApiModelProperty(value = "是否在服务区")
+    private Integer NoSignal;
+
+    @ApiModelProperty(value = "显示状态")
+    private String ViewState;
+
+    @ApiModelProperty(value = "备注")
+    private String Remark;
+
+    @ApiModelProperty(value = "最后上传时间")
+    private LocalDateTime LastUploadTime;
+
+    @ApiModelProperty(value = "创建时间",hidden = true)
+    private LocalDateTime gmtCreate;
+
+    @ApiModelProperty(value = "更新时间",hidden = true)
+    private LocalDateTime gmtModified;
+
+    @ApiModelProperty(value = "是否是家用")
+    private Boolean isFamily;
+
+
+}

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

@@ -232,6 +232,7 @@ public class LocalBusPatientService extends BaseService<BusPatientMapper, BusPat
      * @param patientCode
      * @return
      */
+    @Transactional(rollbackFor = Exception.class)
     public BusPatientEntity getOneByHospitalAndPatientCode(String tenantId, String patientCode) {
         BusPatientEntity patient = this.getOne(new QueryWrapper<BusPatientEntity>().lambda()
                 .eq(BusPatientEntity::getTenantId, tenantId)
@@ -577,4 +578,10 @@ public class LocalBusPatientService extends BaseService<BusPatientMapper, BusPat
     public void delInviteCode(String inviteCode) {
         inviteCodeUtil.delCode(inviteCode);
     }
+
+    @Override
+    public String lookPatientId(String tenantId, String patientCode) {
+        BusPatientEntity patient = this.getOneByHospitalAndPatientCode(tenantId, patientCode);
+        return patient.getId();
+    }
 }