add

输注列表新增输注标识

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

@@ -2,6 +2,8 @@ package com.nb.web.api.feign.result;
 
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.nb.web.api.enums.*;
 import com.nb.core.enums.SexEnum;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -216,6 +218,12 @@ public class PatientMonitorResult implements Serializable {
     @ApiModelProperty("阻塞状态")
     private BlockStatusEnum blockStatus;
 
+    @ApiModelProperty("是否存在异常标识")
+    private Boolean abnormal;
+
+    @ApiModelProperty("异常标识备注")
+    private String abnormalReason;
+
     private void judgeWarnWillFinished() {
         if(!Boolean.TRUE.equals(this.warnWillFinished)){
            return;

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

@@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.nb.app.assistant.api.bean.HandleBindResult;
 import com.nb.app.assistant.api.entity.AssistantUserBindEntity;
 import com.nb.app.assistant.api.feign.IAssistantUserBindClient;

nb-service/web-service/src/main/resources/mapper/bus/BusPatientMapper.xml

@@ -85,6 +85,8 @@
         <result column="block1" property="block1"/>
         <result column="block2" property="block2"/>
         <result column="block_status" property="blockStatus"/>
+        <result column="abnormal" property="abnormal"/>
+        <result column="abnormal_reason" property="abnormalReason"/>
     </resultMap>
 
     <resultMap id="deviceNone" type="com.nb.web.service.bus.service.dto.PatientDeviceNoneResult">
@@ -245,7 +247,9 @@
         c.ward as ward,
         c.bed_no as bed_no,
         c.eval_time as eval_time,
-        c.manage_type as manage_type
+        c.manage_type as manage_type,
+        c.abnormal as abnormal,
+        c.abnormal_reason as abnormal_reason
         from
         (select * from bus_patient
         <where>