Merge remote-tracking branch 'origin/master'

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/config/PatientMonitorListener.java

@@ -176,6 +176,7 @@ public class PatientMonitorListener {
         Function<BizInfusionHistoryPO, Boolean> check = o -> StrUtil.isNotBlank(o.getDeviceAlarm())
                 && !o.getDeviceAlarm().equals(FlowStatusEnum.None.name());
         alarmPO.setAlarm(check.apply(infusionHistory));
+        log.info("报警信息处理完成 ");
         return alarmPO;
     }
 

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/mapper/BizDeviceAlarmMapper.java

@@ -27,6 +27,12 @@ public interface BizDeviceAlarmMapper {
             @Mapping(source = "warnWillFinished", target = "warnWillFinished"),
             @Mapping(source = "warnAnalgesicPoor", target = "warnAnalgesicPoor"),
             @Mapping(source = "id", target = "historyId"),
+            @Mapping(target = "id", ignore = true),
+            @Mapping(target = "createTime", ignore = true),
+            @Mapping(target = "updateTime", ignore = true),
+            @Mapping(target = "createBy", ignore = true),
+            @Mapping(target = "updateBy", ignore = true),
+            @Mapping(target = "tenantId", ignore = true)
     })
     BizDeviceAlarmPO convertInfusionToPO(BizInfusionHistoryPO source);
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/web/controller/BizClinicRoomController.java

@@ -26,7 +26,7 @@ import java.util.Date;
  * @author lf
  * @date  2025/06/09 10:59
  */
-@Api(tags = "")
+@Api(tags = "诊疗室")
 @RestController
 @RequestMapping("/smart/clinicRoom")
 @AllArgsConstructor