update 删除重复报警和提醒

nb-system/src/main/java/com/nb/bus/entity/common/DeviceProperties.java

@@ -41,6 +41,9 @@ public class DeviceProperties<K,T>  extends TenantGenericEntity<K,T> {
     @ApiModelProperty(value = "设备上传住院号")
     private String patientCode;
 
+    @ApiModelProperty(value = "设备住院号所绑定id")
+    private String patientId;
+
     @ApiModelProperty(value = "病区")
     private String ward;
 

nb-system/src/main/resources/mapper/bus/BusInfusionHistoryMapper.xml

@@ -4,6 +4,7 @@
 
     <resultMap id="combineResult" type="com.nb.bus.service.dto.CombineResult">
         <result column="infusion_id" property="id"/>
+        <result column="patient_id" property="patientCode"/>
         <result column="device_id" property="deviceId"/>
         <result column="classification" property="classification"/>
         <result column="data_num" property="dataNumber"/>
@@ -130,6 +131,7 @@
         i.patient_code as patient_code,
         c.ward as ward,
         c.bed_no as bed_no,
+        p.id as patient_id,
         i.total_dose as total_dose,
         i.first_dose as first_dose,
         i.remain_dose as remain_dose,