add

添加阻塞值

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

@@ -209,6 +209,16 @@ public class PatientMonitorResult implements Serializable {
     @ApiModelProperty("最后上传时间")
     private Date lastUploadTime;
 
+
+    @ApiModelProperty("运行时电机的压力值")
+    private Integer block1;
+
+    @ApiModelProperty("非运行时电机的压力值")
+    private Integer block2;
+
+    @ApiModelProperty("阻塞状态")
+    private BlockStatusEnum blockStatus;
+
     private void judgeWarnWillFinished() {
         if(!Boolean.TRUE.equals(this.warnWillFinished)){
            return;

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

@@ -82,6 +82,9 @@
         <result column="eval_time" property="evalTime"/>
         <result column="patient_id" property="patientId"/>
         <result column="manage_type" property="manageType"/>
+        <result column="block_1" property="block1"/>
+        <result column="block_2" property="block2"/>
+        <result column="block_status" property="blockStatus"/>
     </resultMap>
 
     <resultMap id="deviceNone" type="com.nb.web.service.bus.service.dto.PatientDeviceNoneResult">
@@ -223,6 +226,9 @@
         i.remark as remark,
         i.type as device_type,
         i.last_upload_time as last_upload_time,
+        i.block1 as block1,
+        i.block2 as block2,
+        i.block_status  as block_status,
         <!--d.alias as device_alias,-->
         <!--d.product_no as product_no ,-->
         c.patient_gender as patient_gender,