PO、DTO类修改

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusClinicDTO.java

@@ -29,9 +29,9 @@ public class BusClinicDTO extends BaseDTO  {
     @NotBlank(message = "主键不能为空", groups = {Update.class})
     private String id;
 
-    @Schema(description = "关联患者表主键")
-    @NotBlank(message = "关联患者表主键不能为空", groups = {Update.class, Insert.class})
-    private String patientId;
+    @Schema(description = "患者唯一标识")
+    @NotBlank(message = "患者唯一标识不能为空", groups = {Update.class, Insert.class})
+    private String patientUniqueId;
 
     @Schema(description = "负责医生id")
     @NotBlank(message = "负责医生id不能为空", groups = {Update.class, Insert.class})
@@ -64,6 +64,23 @@ public class BusClinicDTO extends BaseDTO  {
     @NotBlank(message = "设备id不能为空", groups = {Update.class, Insert.class})
     private String deviceId;
 
-    @Schema(description = "治疗记录id")
-    private String therapyId;
+    @Schema(description = "删除标志（0代表存在 1代表删除）")
+    @NotNull(message = "删除标志不能为空", groups = {Update.class, Insert.class})
+    private Integer isDelete;
+
+    @Schema(description = "医院id")
+    @NotBlank(message = "医院id不能为空", groups = {Update.class, Insert.class})
+    private String tenantId;
+
+    @Schema(description = "设备与患者的绑定开始时间")
+    @NotBlank(message = "设备与患者的绑定开始时间不能为空", groups = {Update.class, Insert.class})
+    private String bindStartTime;
+
+    @Schema(description = "设备与患者的绑定结束时间")
+    private String bindEndTime;
+
+    @Schema(description = "是否当前绑定（1=当前绑定，0=历史绑定）")
+    @NotNull(message = "是否当前绑定不能为空", groups = {Update.class, Insert.class})
+    private Integer isCurrentBind;
+
 }

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusClinicQueryDTO.java

@@ -1,5 +1,9 @@
 package cn.tr.module.phototherapy.common.dto;
 
+import cn.tr.core.validation.Insert;
+import cn.tr.core.validation.Update;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.ToString;
 import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -21,8 +25,8 @@ public class BusClinicQueryDTO  implements Serializable{
     @Schema(description = "主键")
     private String id;
 
-    @Schema(description = "关联患者表主键")
-    private String patientId;
+    @Schema(description = "患者唯一标识")
+    private String patientUniqueId;
 
     @Schema(description = "负责医生id")
     private String userId;
@@ -51,6 +55,18 @@ public class BusClinicQueryDTO  implements Serializable{
     @Schema(description = "设备id")
     private String deviceId;
 
-    @Schema(description = "治疗记录id")
-    private String therapyId;
+    @Schema(description = "删除标志（0代表存在 1代表删除）")
+    private Integer isDelete;
+
+    @Schema(description = "医院id")
+    private String tenantId;
+
+    @Schema(description = "设备与患者的绑定开始时间")
+    private String bindStartTime;
+
+    @Schema(description = "设备与患者的绑定结束时间")
+    private String bindEndTime;
+
+    @Schema(description = "是否当前绑定（1=当前绑定，0=历史绑定）")
+    private Integer isCurrentBind;
 }

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusDeviceAlarmDTO.java

@@ -52,6 +52,9 @@ public class BusDeviceAlarmDTO extends BaseDTO  {
     @NotNull(message = "设备运行状态不能为空", groups = {Update.class, Insert.class})
     private Integer runState;
 
+    @Schema(description = "医院id")
+    private String tenantId;
+
     @Schema(description = "报警时间")
     private Date alarmTime;
 

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusDeviceAlarmQueryDTO.java

@@ -43,6 +43,8 @@ public class BusDeviceAlarmQueryDTO  implements Serializable{
     @Schema(description = "设备运行状态")
     private Integer runState;
 
+    @Schema(description = "医院id")
+    private String tenantId;
 
     @Schema(description = "报警时间")
     private LocalDateTime alarmTime;

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusDeviceDTO.java

@@ -47,6 +47,8 @@ public class BusDeviceDTO extends BaseDTO  {
     @NotNull(message = "是否启用不能为空", groups = {Update.class, Insert.class})
     private Integer enable;
 
+    @Schema(description = "医院id")
+    private String tenantId;
 
     @Schema(description = "删除标志（0代表存在 1代表删除）")
     @NotNull(message = "删除标志不能为空", groups = {Update.class, Insert.class})

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusDeviceHistoryDTO.java

@@ -74,4 +74,11 @@ public class BusDeviceHistoryDTO extends BaseDTO  {
     @Schema(description = "报警详情")
     private String alarmDesc;
 
+    @Schema(description = "删除标志（0代表存在 1代表删除）")
+    @NotNull(message = "删除标志不能为空", groups = {Update.class, Insert.class})
+    private Integer isDelete;
+
+    @Schema(description = "医院id")
+    private String tenantId;
+
 }

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusDeviceHistoryQueryDTO.java

@@ -1,5 +1,8 @@
 package cn.tr.module.phototherapy.common.dto;
 
+import cn.tr.core.validation.Insert;
+import cn.tr.core.validation.Update;
+import jakarta.validation.constraints.NotNull;
 import lombok.ToString;
 import lombok.Data;
 
@@ -64,4 +67,9 @@ public class BusDeviceHistoryQueryDTO  implements Serializable{
     @Schema(description = "报警详情")
     private String alarmDesc;
 
+    @Schema(description = "删除标志（0代表存在 1代表删除）")
+    private Integer isDelete;
+
+    @Schema(description = "医院id")
+    private String tenantId;
 }

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusDeviceQueryDTO.java

@@ -38,6 +38,8 @@ public class BusDeviceQueryDTO  implements Serializable{
     @Schema(description = "是否启用（0启用 1关闭）")
     private Integer enable;
 
+    @Schema(description = "医院id")
+    private String tenantId;
 
     @Schema(description = "删除标志（0代表存在 1代表删除）")
     private Integer isDelete;

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusHospitalConfigDTO.java

@@ -28,6 +28,10 @@ public class BusHospitalConfigDTO extends BaseDTO  {
     @NotBlank(message = "主键不能为空", groups = {Update.class})
     private String id;
 
+    @Schema(description = "医院id")
+    @NotBlank(message = "医院id不能为空", groups = {Update.class, Insert.class})
+    private String tenantId;
+
     @Schema(description = "依从性阈值（%）")
     @NotNull(message = "依从性阈值不能为空", groups = {Update.class, Insert.class})
     private BigDecimal complianceThreshold;

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusHospitalConfigQueryDTO.java

@@ -23,6 +23,9 @@ public class BusHospitalConfigQueryDTO  implements Serializable{
     @Schema(description = "主键")
     private String id;
 
+    @Schema(description = "医院id")
+    private String tenantId;
+
     @Schema(description = "依从性阈值（%）")
     private BigDecimal complianceThreshold;
 

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusHospitalDTO.java

@@ -32,4 +32,8 @@ public class BusHospitalDTO extends BaseDTO  {
 
     @Schema(description = "logo文件")
     private String logoPath;
+
+    @Schema(description = "逻辑删除")
+    @NotBlank(message = "逻辑删除不能为空", groups = {Update.class, Insert.class})
+    private Integer isDeleted;
 }

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusHospitalQueryDTO.java

@@ -1,5 +1,8 @@
 package cn.tr.module.phototherapy.common.dto;
 
+import cn.tr.core.validation.Insert;
+import cn.tr.core.validation.Update;
+import jakarta.validation.constraints.NotBlank;
 import lombok.ToString;
 import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -26,4 +29,7 @@ public class BusHospitalQueryDTO  implements Serializable{
 
     @Schema(description = "logo文件")
     private String logoPath;
+
+    @Schema(description = "逻辑删除")
+    private Integer isDeleted;
 }

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusTherapyPlanDTO.java

@@ -55,6 +55,9 @@ public class BusTherapyPlanDTO extends BaseDTO  {
     @NotNull(message = "方案状态不能为空", groups = {Update.class, Insert.class})
     private Integer therapyStatus;
 
+    @Schema(description = "医院id")
+    private String tenantId;
+
     @Schema(description = "逻辑删除（0存在 1删除）")
     @NotNull(message = "逻辑删除不能为空", groups = {Update.class, Insert.class})
     private Integer isDelete;

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusTherapyPlanQueryDTO.java

@@ -42,6 +42,9 @@ public class BusTherapyPlanQueryDTO  implements Serializable{
     @Schema(description = "方案状态（0启用 1等待启用 2终止）")
     private Integer therapyStatus;
 
+    @Schema(description = "医院id")
+    private String tenantId;
+
     @Schema(description = "逻辑删除（0存在 1删除）")
     private Integer isDelete;
 

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusTherapyRecordDTO.java

@@ -65,6 +65,9 @@ public class BusTherapyRecordDTO extends BaseDTO  {
     @NotNull(message = "依从性报警不能为空", groups = {Update.class, Insert.class})
     private Integer complianceAlarm;
 
+    @Schema(description = "医院id")
+    private String tenantId;
+
     @Schema(description = "删除标志（0存在  1删除）")
     @NotNull(message = "删除标志不能为空", groups = {Update.class, Insert.class})
     private Integer isDelete;

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusTherapyRecordQueryDTO.java

@@ -55,6 +55,9 @@ public class BusTherapyRecordQueryDTO  implements Serializable{
     @Schema(description = "依从性报警（0未显示  1显示）")
     private Integer complianceAlarm;
 
+    @Schema(description = "医院id")
+    private String tenantId;
+
     @Schema(description = "删除标志（0存在  1删除）")
     private Integer isDelete;
 

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/po/BusClinicPO.java

@@ -28,9 +28,9 @@ public class BusClinicPO extends TenantPO {
     @Schema(description = "主键")
     private String id;
 
-    /** 关联患者表主键 */
-    @Schema(description = "关联患者表主键")
-    private String patientId;
+    /** 患者唯一标识 */
+    @Schema(description = "患者唯一标识")
+    private String patientUniqueId;
 
     /** 负责医生id */
     @Schema(description = "负责医生id")
@@ -69,7 +69,24 @@ public class BusClinicPO extends TenantPO {
     @Schema(description = "设备id")
     private String deviceId;
 
-    /** 治疗记录id */
-    @Schema(description = "治疗记录id")
-    private String therapyId;
+    /** 医院id */
+    @Schema(description = "医院id")
+    private String tenantId;
+
+    /** 删除标志（0代表存在 1代表删除） */
+    @Schema(description = "删除标志（0代表存在 1代表删除）")
+    private Integer isDelete;
+
+    /** 设备与患者的绑定开始时间 */
+    @Schema(description = "设备与患者的绑定开始时间")
+    private String bindStartTime;
+
+    /** 设备与患者的绑定结束时间 */
+    @Schema(description = "设备与患者的绑定结束时间")
+    private String bindEndTime;
+
+    /** 是否当前绑定（1=当前绑定，0=历史绑定）*/
+    @Schema(description = "是否当前绑定（1=当前绑定，0=历史绑定）")
+    private Integer isCurrentBind;
+
 }

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/po/BusDeviceAlarmPO.java

@@ -53,6 +53,10 @@ public class BusDeviceAlarmPO extends TenantPO {
     @Schema(description = "设备运行状态")
     private Integer runState;
 
+    /** 医院id */
+    @Schema(description = "医院id")
+    private String tenantId;
+
     /** 报警时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "报警时间")

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/po/BusDeviceHistoryPO.java

@@ -83,4 +83,12 @@ public class BusDeviceHistoryPO extends TenantPO {
     @Schema(description = "报警详情")
     private String alarmDesc;
 
+    /** 删除标志（0代表存在 1代表删除） */
+    @Schema(description = "删除标志（0代表存在 1代表删除）")
+    private Integer isDelete;
+
+    /** 医院id */
+    @Schema(description = "医院id")
+    private String tenantId;
+
 }

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/po/BusDevicePO.java

@@ -48,6 +48,9 @@ public class BusDevicePO extends TenantPO {
     @Schema(description = "是否启用（0启用 1关闭）")
     private Integer enable;
 
+    /** 医院id */
+    @Schema(description = "医院id")
+    private String tenantId;
 
     /** 删除标志（0代表存在 1代表删除） */
     @Schema(description = "删除标志（0代表存在 1代表删除）")

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/po/BusHospitalConfigPO.java

@@ -26,6 +26,10 @@ public class BusHospitalConfigPO extends TenantPO {
     @Schema(description = "主键")
     private String id;
 
+    /** 医院id */
+    @Schema(description = "医院id")
+    private String tenantId;
+
     /** 依从性阈值（%） */
     @Schema(description = "依从性阈值（%）")
     private BigDecimal complianceThreshold;

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/po/BusHospitalPO.java

@@ -33,4 +33,8 @@ public class BusHospitalPO extends TenantPO {
     /** logo文件 */
     @Schema(description = "logo文件")
     private String logoPath;
+
+    /** 删除标志（0代表存在 1代表删除） */
+    @Schema(description = "删除标志（0代表存在 1代表删除）")
+    private Integer isDelete;
 }

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/po/BusTherapyPlanPO.java

@@ -53,6 +53,9 @@ public class BusTherapyPlanPO extends TenantPO {
     @Schema(description = "方案状态（0启用 1等待启用 2终止）")
     private Integer therapyStatus;
 
+    /** 医院id */
+    @Schema(description = "医院id")
+    private String tenantId;
 
     /** 逻辑删除（0存在 1删除） */
     @Schema(description = "逻辑删除（0存在 1删除）")

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/po/BusTherapyRecordPO.java

@@ -68,6 +68,9 @@ public class BusTherapyRecordPO extends TenantPO {
     @Schema(description = "依从性报警（0未显示  1显示）")
     private Integer complianceAlarm;
 
+    /** 医院id */
+    @Schema(description = "医院id")
+    private String tenantId;
 
     /** 删除标志（0存在  1删除） */
     @Schema(description = "删除标志（0存在  1删除）")

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/impl/BusClinicServiceImpl.java

@@ -39,7 +39,7 @@ public class BusClinicServiceImpl extends ServiceImpl<BusClinicRepository, BusCl
         return BusClinicMapper.INSTANCE.convertDtoList(
                 this.list(new LambdaQueryWrapper<BusClinicPO>()
                     .eq(ObjectUtil.isNotNull(query.getId()), BusClinicPO::getId, query.getId())
-                    .eq(ObjectUtil.isNotNull(query.getPatientId()), BusClinicPO::getPatientId, query.getPatientId())
+                    .eq(ObjectUtil.isNotNull(query.getPatientUniqueId()), BusClinicPO::getPatientUniqueId, query.getPatientUniqueId())
                     .eq(ObjectUtil.isNotNull(query.getUserId()), BusClinicPO::getUserId, query.getUserId())
                     .eq(ObjectUtil.isNotNull(query.getLastTreatmentTime()), BusClinicPO::getLastTreatmentTime, query.getLastTreatmentTime())
                     .eq(ObjectUtil.isNotNull(query.getTherapyPlanId()), BusClinicPO::getTherapyPlanId, query.getTherapyPlanId())
@@ -49,7 +49,7 @@ public class BusClinicServiceImpl extends ServiceImpl<BusClinicRepository, BusCl
                     .like(ObjectUtil.isNotNull(query.getPatentPhone()), BusClinicPO::getPatentPhone, query.getPatentPhone())
                     .like(ObjectUtil.isNotNull(query.getPatientAddress()), BusClinicPO::getPatientAddress, query.getPatientAddress())
                     .eq(ObjectUtil.isNotNull(query.getDeviceId()), BusClinicPO::getDeviceId, query.getDeviceId())
-                    .eq(ObjectUtil.isNotNull(query.getTherapyId()), BusClinicPO::getTherapyId, query.getTherapyId())
+                    .eq(ObjectUtil.isNotNull(query.getTenantId()), BusClinicPO::getTenantId, query.getTenantId())
                 )
         );
     };

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/impl/BusDeviceAlarmServiceImpl.java

@@ -2,6 +2,7 @@ package cn.tr.module.phototherapy.common.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import cn.tr.module.phototherapy.common.po.BusClinicPO;
 import org.springframework.stereotype.Service;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -15,6 +16,7 @@ import cn.tr.module.phototherapy.common.dto.BusDeviceAlarmQueryDTO;
 import java.util.*;
 import cn.tr.module.phototherapy.common.service.IBusDeviceAlarmService;
 import cn.tr.module.phototherapy.common.mapper.BusDeviceAlarmMapper;
+import jakarta.annotation.Resource;
 import cn.tr.core.exception.TRExcCode;
 
 /**
@@ -45,6 +47,7 @@ public class BusDeviceAlarmServiceImpl extends ServiceImpl<BusDeviceAlarmReposit
                     .eq(ObjectUtil.isNotNull(query.getTherapyId()), BusDeviceAlarmPO::getTherapyId, query.getTherapyId())
                     .eq(ObjectUtil.isNotNull(query.getRunState()), BusDeviceAlarmPO::getRunState, query.getRunState())
                     .eq(ObjectUtil.isNotNull(query.getAlarmTime()), BusDeviceAlarmPO::getAlarmTime, query.getAlarmTime())
+                    .eq(ObjectUtil.isNotNull(query.getTenantId()), BusDeviceAlarmPO::getTenantId, query.getTenantId())
                 )
         );
     };

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/impl/BusDeviceHistoryServiceImpl.java

@@ -1,7 +1,6 @@
 package cn.tr.module.phototherapy.common.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -15,6 +14,7 @@ import cn.tr.module.phototherapy.common.dto.BusDeviceHistoryQueryDTO;
 import java.util.*;
 import cn.tr.module.phototherapy.common.service.IBusDeviceHistoryService;
 import cn.tr.module.phototherapy.common.mapper.BusDeviceHistoryMapper;
+import jakarta.annotation.Resource;
 import cn.tr.core.exception.TRExcCode;
 
 /**
@@ -26,6 +26,8 @@ import cn.tr.core.exception.TRExcCode;
 @Service
 public class BusDeviceHistoryServiceImpl extends ServiceImpl<BusDeviceHistoryRepository, BusDeviceHistoryPO> implements IBusDeviceHistoryService {
 
+
+
     /**
     * 根据条件查询设备历史
     * @param    query 查询参数

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/impl/BusDeviceServiceImpl.java

@@ -2,6 +2,7 @@ package cn.tr.module.phototherapy.common.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import cn.tr.module.phototherapy.common.po.BusClinicPO;
 import org.springframework.stereotype.Service;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -15,6 +16,7 @@ import cn.tr.module.phototherapy.common.dto.BusDeviceQueryDTO;
 import java.util.*;
 import cn.tr.module.phototherapy.common.service.IBusDeviceService;
 import cn.tr.module.phototherapy.common.mapper.BusDeviceMapper;
+import jakarta.annotation.Resource;
 import cn.tr.core.exception.TRExcCode;
 
 /**
@@ -48,6 +50,7 @@ public class BusDeviceServiceImpl extends ServiceImpl<BusDeviceRepository, BusDe
                     .eq(ObjectUtil.isNotNull(query.getRunTime()), BusDevicePO::getRunTime, query.getRunTime())
                     .eq(ObjectUtil.isNotNull(query.getCloseTime()), BusDevicePO::getCloseTime, query.getCloseTime())
                     .eq(ObjectUtil.isNotNull(query.getPatientUniqueId()), BusDevicePO::getPatientUniqueId, query.getPatientUniqueId())
+                    .eq(ObjectUtil.isNotNull(query.getTenantId()), BusDevicePO::getTenantId, query.getTenantId())
                 )
         );
     };

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/impl/BusHospitalConfigServiceImpl.java

@@ -1,7 +1,6 @@
 package cn.tr.module.phototherapy.common.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -15,6 +14,7 @@ import cn.tr.module.phototherapy.common.dto.BusHospitalConfigQueryDTO;
 import java.util.*;
 import cn.tr.module.phototherapy.common.service.IBusHospitalConfigService;
 import cn.tr.module.phototherapy.common.mapper.BusHospitalConfigMapper;
+import jakarta.annotation.Resource;
 import cn.tr.core.exception.TRExcCode;
 
 /**
@@ -94,6 +94,6 @@ public class BusHospitalConfigServiceImpl extends ServiceImpl<BusHospitalConfigR
         if(CollectionUtil.isEmpty(ids)){
             throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"请选择要删除的数据");
         }
-        return this.removeBatchByIds(ids);
+        return this.removeByIds(ids);
     };
 }

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/impl/BusHospitalServiceImpl.java

@@ -2,6 +2,7 @@ package cn.tr.module.phototherapy.common.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import cn.tr.module.phototherapy.common.po.BusClinicPO;
 import org.springframework.stereotype.Service;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -40,6 +41,7 @@ public class BusHospitalServiceImpl extends ServiceImpl<BusHospitalRepository, B
                     .eq(ObjectUtil.isNotNull(query.getTenantId()), BusHospitalPO::getTenantId, query.getTenantId())
                     .like(ObjectUtil.isNotNull(query.getHospitalName()), BusHospitalPO::getHospitalName, query.getHospitalName())
                     .eq(ObjectUtil.isNotNull(query.getLogoPath()), BusHospitalPO::getLogoPath, query.getLogoPath())
+                    .eq(ObjectUtil.isNotNull(query.getTenantId()), BusHospitalPO::getTenantId, query.getTenantId())
                 )
         );
     };

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/impl/BusTherapyPlanServiceImpl.java

@@ -2,6 +2,7 @@ package cn.tr.module.phototherapy.common.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import cn.tr.module.phototherapy.common.po.BusClinicPO;
 import org.springframework.stereotype.Service;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -15,6 +16,7 @@ import cn.tr.module.phototherapy.common.dto.BusTherapyPlanQueryDTO;
 import java.util.*;
 import cn.tr.module.phototherapy.common.service.IBusTherapyPlanService;
 import cn.tr.module.phototherapy.common.mapper.BusTherapyPlanMapper;
+import jakarta.annotation.Resource;
 import cn.tr.core.exception.TRExcCode;
 
 /**
@@ -47,6 +49,7 @@ public class BusTherapyPlanServiceImpl extends ServiceImpl<BusTherapyPlanReposit
                     .eq(ObjectUtil.isNotNull(query.getPhaseDurationMin()), BusTherapyPlanPO::getPhaseDurationMin, query.getPhaseDurationMin())
                     .eq(ObjectUtil.isNotNull(query.getTherapyStatus()), BusTherapyPlanPO::getTherapyStatus, query.getTherapyStatus())
                     .eq(ObjectUtil.isNotNull(query.getIsDelete()), BusTherapyPlanPO::getIsDelete, query.getIsDelete())
+                    .eq(ObjectUtil.isNotNull(query.getTenantId()), BusTherapyPlanPO::getTenantId, query.getTenantId())
                 )
         );
     };

tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/impl/BusTherapyRecordServiceImpl.java

@@ -2,6 +2,7 @@ package cn.tr.module.phototherapy.common.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import cn.tr.module.phototherapy.common.po.BusClinicPO;
 import org.springframework.stereotype.Service;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -15,6 +16,7 @@ import cn.tr.module.phototherapy.common.dto.BusTherapyRecordQueryDTO;
 import java.util.*;
 import cn.tr.module.phototherapy.common.service.IBusTherapyRecordService;
 import cn.tr.module.phototherapy.common.mapper.BusTherapyRecordMapper;
+import jakarta.annotation.Resource;
 import cn.tr.core.exception.TRExcCode;
 
 /**
@@ -49,6 +51,7 @@ public class BusTherapyRecordServiceImpl extends ServiceImpl<BusTherapyRecordRep
                     .eq(ObjectUtil.isNotNull(query.getOverTherapy()), BusTherapyRecordPO::getOverTherapy, query.getOverTherapy())
                     .eq(ObjectUtil.isNotNull(query.getComplianceAlarm()), BusTherapyRecordPO::getComplianceAlarm, query.getComplianceAlarm())
                     .eq(ObjectUtil.isNotNull(query.getIsDelete()), BusTherapyRecordPO::getIsDelete, query.getIsDelete())
+                    .eq(ObjectUtil.isNotNull(query.getTenantId()), BusTherapyRecordPO::getTenantId, query.getTenantId())
                 )
         );
     };

tr-test/.flattened-pom.xml

@@ -20,16 +20,16 @@
       <artifactId>spring-boot-starter-data-redis</artifactId>
       <exclusions>
         <exclusion>
-          <artifactId>spring-boot-starter-logging</artifactId>
           <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter-logging</artifactId>
         </exclusion>
         <exclusion>
-          <artifactId>logback-classic</artifactId>
           <groupId>ch.qos.logback</groupId>
+          <artifactId>logback-classic</artifactId>
         </exclusion>
         <exclusion>
-          <artifactId>log4j-to-slf4j</artifactId>
           <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-to-slf4j</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -38,16 +38,16 @@
       <artifactId>spring-boot-starter</artifactId>
       <exclusions>
         <exclusion>
-          <artifactId>spring-boot-starter-logging</artifactId>
           <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter-logging</artifactId>
         </exclusion>
         <exclusion>
-          <artifactId>logback-classic</artifactId>
           <groupId>ch.qos.logback</groupId>
+          <artifactId>logback-classic</artifactId>
         </exclusion>
         <exclusion>
-          <artifactId>log4j-to-slf4j</artifactId>
           <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-to-slf4j</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -56,8 +56,8 @@
       <artifactId>spring-boot-starter-log4j2</artifactId>
       <exclusions>
         <exclusion>
-          <artifactId>log4j-to-slf4j</artifactId>
           <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-to-slf4j</artifactId>
         </exclusion>
       </exclusions>
     </dependency>