From 15dfd6a9c710e3d7a65ad9bb7abc7aaccdd5cb2f Mon Sep 17 00:00:00 2001
From: lianlonggang <lianlonggang@qq.com>
Date: Wed, 8 Apr 2026 17:17:18 +0800
Subject: [PATCH] =?UTF-8?q?fix(doctor):=20=E4=BF=AE=E6=AD=A3=E5=8C=BB?=
 =?UTF-8?q?=E7=94=9F=E6=BB=A1=E6=84=8F=E5=BA=A6=E7=BB=9F=E8=AE=A1=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E5=9B=9E=E5=A4=8D=E6=95=B0=E8=AE=A1=E7=AE=97=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 排除音视频会话数，只统计文字回复数量
- 回复数计算结果取非负值避免出现负数
- 24小时回复率统计不再包含音视频会话

fix(watch): 修复手表设备绑定时的组织代码比较逻辑

- 修正绑定验证时使用正确的组织代码字段
- 防止因字段引用错误导致的绑定权限检查失败

refactor(watch): 将警告开关异步保存以提高系统稳定性

- 使用异步任务执行外部系统调用
- 避免外部系统异常影响主业务流程
- 解绑非必要操作以增强系统容错性
---
 .../service/impl/ConDoctorServiceImpl.java    |  5 +++-
 .../service/impl/WatchDeviceServiceImpl.java  | 27 ++++++++++---------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConDoctorServiceImpl.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConDoctorServiceImpl.java
index f5dc8bd..9938ef9 100644
--- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConDoctorServiceImpl.java
+++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConDoctorServiceImpl.java
@@ -353,7 +353,10 @@ public class ConDoctorServiceImpl extends ServiceImpl<ConDoctorMapper, ConDoctor
             }
             String userScore = conDoctorSatisfy.getUserScore();
             String userScoreNum = conDoctorSatisfy.getUserScoreNum();
-            String replyNum = conDoctorSatisfy.getReplyNum();
+            // 回复数排除音视频会话数（音视频为实时通话，不计入文字回复统计），结果取非负值
+            int replyNumVal = Math.max(Integer.parseInt(conDoctorSatisfy.getReplyNum()) - item.getAudioVideo(), 0);
+            String replyNum = String.valueOf(replyNumVal);
+            //24小时回复率不计算音视频
             String messageNum = conDoctorSatisfy.getMessageNum();
 
             String a = conDoctorApiService.averageJudgment(item.getId(), new BigDecimal(userScore), new BigDecimal(userScoreNum));
diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDeviceServiceImpl.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDeviceServiceImpl.java
index cfb2deb..48b3674 100644
--- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDeviceServiceImpl.java
+++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDeviceServiceImpl.java
@@ -300,9 +300,9 @@ public class WatchDeviceServiceImpl extends ServiceImpl<WatchDeviceMapper, Watch
         // 新增手表只能绑定给本单位的人
         LoginUser userById = sysBaseAPI.getUserById(dto.getBindUserId());
 
-        if (userById.getOrgCode() == null || dto.getOrgCode() == null ||
-            userById.getOrgCode().length() < 6 || dto.getOrgCode().length() < 6 ||
-            !userById.getOrgCode().substring(0, 6).equals(dto.getOrgCode().substring(0, 6))) {
+        if (userById.getOrgCode() == null || watchDevice.getOrgCode() == null ||
+            userById.getOrgCode().length() < 6 || watchDevice.getOrgCode().length() < 6 ||
+            !userById.getOrgCode().substring(0, 6).equals(watchDevice.getOrgCode().substring(0, 6))) {
             return Result.error("手表只能绑定给本单位人员");
         }
 
@@ -504,15 +504,18 @@ public class WatchDeviceServiceImpl extends ServiceImpl<WatchDeviceMapper, Watch
         switchUpdateWrapper.eq(WatchDeviceSwitch::getWatchNo, dto.getWatchNo());
         watchDeviceSwitchService.update(switchUpdateWrapper);
         String[] wdTypes = {"heart_rate", "spo2", "stress", "temperature"};
-        for (int i = 0; i < wdTypes.length; i++) {
-            WarnSwitch warnSwitch = new WarnSwitch();
-            warnSwitch.setWatchNo(dto.getWatchNo());
-            warnSwitch.setWdType(wdTypes[i]);
-            warnSwitch.setSwitchFlag("1");
-            dataCenterExecutor.saveWarnSwitch(warnSwitch);
-        }
-        //通知更新
-        dataCenterExecutor.cmdUpdateSwitch(dto.getWatchNo());
+        // 异步调用外部系统，防止外部系统异常导致功能异常，解绑这里非必要
+        asyncTaskExecutor.execute(() -> {
+            for (int i = 0; i < wdTypes.length; i++) {
+                WarnSwitch warnSwitch = new WarnSwitch();
+                warnSwitch.setWatchNo(dto.getWatchNo());
+                warnSwitch.setWdType(wdTypes[i]);
+                warnSwitch.setSwitchFlag("1");
+                dataCenterExecutor.saveWarnSwitch(warnSwitch);
+            }
+            //通知更新
+            dataCenterExecutor.cmdUpdateSwitch(dto.getWatchNo());
+        });
     }
 
     /**