Merge remote-tracking branch 'origin/master'

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/app/controller/AppClinicRoomController.java

@@ -159,4 +159,11 @@ public class AppClinicRoomController extends BaseController {
     public CommonResult<Boolean> bindDevice(@RequestBody AppDoctorBindPumpDTO source) {
         return CommonResult.success(clinicRoomService.bindDevice(source));
     }
+
+    @ApiOperationSupport(author = "wangzl", order = 15)
+    @ApiOperation(value = "解绑泵信息", notes = "权限： 无")
+    @PostMapping("/unBindDevice")
+    public CommonResult<Boolean> unBindDevice(@RequestBody AppDoctorUnBindPumpDTO source) {
+        return CommonResult.success(clinicRoomService.unBindDevice(source));
+    }
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/app/controller/dto/AppDoctorUnBindPumpDTO.java

@@ -0,0 +1,24 @@
+package cn.tr.module.smart.app.controller.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * TODO
+ *
+ * @author wangzl
+ * @date 2025/10/16 15:41
+ */
+@Data
+@ApiModel("解绑泵信息")
+public class AppDoctorUnBindPumpDTO implements Serializable {
+
+    @ApiModelProperty("泵Id")
+    private String deviceId;
+
+    @ApiModelProperty("手术ID")
+    private String clinicId;
+}

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/IBizClinicRoomService.java

@@ -227,4 +227,11 @@ public interface IBizClinicRoomService {
      * @date 2025/10/11
      */
     Boolean bindDevice(AppDoctorBindPumpDTO source);
+
+    /**
+     * @description: TODO
+     * @author wangzl
+     * @date 2025/10/16
+     */
+    Boolean unBindDevice(AppDoctorUnBindPumpDTO source);
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizClinicRoomServiceImpl.java

@@ -868,6 +868,24 @@ public class BizClinicRoomServiceImpl implements IBizClinicRoomService {
         return infusionClinicRepository.insert(bizInfusionClinic)!=0;
     }
 
+    /**
+     * @param source
+     * @description: TODO
+     * @author wangzl
+     * @date 2025/10/16
+     */
+    @Override
+    public Boolean unBindDevice(AppDoctorUnBindPumpDTO source) {
+        BizInfusionClinicPO bizInfusionClinicPO = infusionClinicRepository.selectOne(new LambdaQueryWrapper<BizInfusionClinicPO>()
+                .eq(BizInfusionClinicPO::getDeviceId, source.getDeviceId())
+                .eq(BizInfusionClinicPO::getClinicId, source.getClinicId())
+                .last("limit 1"));
+        if (ObjectUtil.isNull(bizInfusionClinicPO)) {
+            throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001, "绑定信息不存在");
+        }
+        return  infusionClinicRepository.deleteById(bizInfusionClinicPO.getId())!=0;
+    }
+
     /**
      * 微信小程序基于医生已填写的信息更新数据
      */