style(watch): 关爱人员标记及相关统计功能调整

health-watch/health-watch-api/src/main/java/com/renkang/watch/bean/transfer/DepartDeviceNum.java

@@ -16,4 +16,10 @@ public class DepartDeviceNum {
 
     private Integer wearCount;
 
+    /** 关爱人员佩戴数 */
+    private Integer careWearCount;
+
+    /** 关爱人员未佩戴数 */
+    private Integer careUnwearCount;
+
 }

health-watch/health-watch-api/src/main/java/com/renkang/watch/bean/transfer/DepartStatTransfer.java

@@ -39,6 +39,12 @@ public class DepartStatTransfer {
     /** 二级部门汇总的非关爱人员数量（仅在指定二级部门时有值） */
     private Integer secondDepartNonCareNum;
 
+    /** 各部门关爱人员佩戴/未佩戴数 Map（orgCode → DepartDeviceNum） */
+    private Map<String, DepartDeviceNum> careWearNumMap;
+
+    /** 二级部门汇总的关爱人员佩戴/未佩戴数（仅在指定二级部门时有值） */
+    private DepartDeviceNum secondDepartCareWearNum;
+
     private IPage<DeptStatData> pagedData;
 
     private List<DeptStatData> data;

health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/dept/DeptStatData.java

@@ -33,28 +33,44 @@ public class DeptStatData {
     /**
      * 佩戴人员数
      */
-    @Excel(name = "佩戴人员数", width = 15,orderNum = "6")
+    @Excel(name = "佩戴人员数", width = 15, orderNum = "6")
     private Integer assignedUserNums;
+    /**
+     * 关爱人员佩戴数
+     */
+    @Excel(name = "关爱人员佩戴人数", width = 18, orderNum = "7")
+    private Integer careWearNums;
     /**
      * 未佩戴人员数
      */
-    @Excel(name = "未佩戴人员数", width = 15,orderNum = "7")
+    @Excel(name = "未佩戴人员数", width = 15, orderNum = "8")
     private Integer undistributedUserNums;
+    /**
+     * 关爱人员未佩戴数
+     */
+    @Excel(name = "关爱人员未佩戴人数", width = 18, orderNum = "9")
+    private Integer careUnwearNums;
 
-    @Excel(name = "心率异常人数", width = 15,orderNum = "8")
+    @Excel(name = "心率异常人数", width = 15, orderNum = "10")
     private Integer heartRateNums;
-    @Excel(name = "血氧异常人数", width = 15,orderNum = "9")
+    @Excel(name = "血氧异常人数", width = 15, orderNum = "11")
     private Integer spo2Nums;
-    @Excel(name = "压力异常人数", width = 15,orderNum = "10")
+    @Excel(name = "压力异常人数", width = 15, orderNum = "12")
     private Integer stressNums;
-    @Excel(name = "体温异常人数", width = 15,orderNum = "11")
+    @Excel(name = "体温异常人数", width = 15, orderNum = "13")
     private Integer tempNums;
 
     /**
      * 非关爱人员数量
      */
-    @Excel(name = "非关爱人员数量", width = 15, orderNum = "12")
+    @Excel(name = "非关爱人员数量", width = 15, orderNum = "14")
     private Integer nonCareNums;
 
+    /**
+     * 关爱人员数量（已分配设备数 - 非关爱人员数量）
+     */
+    @Excel(name = "关爱人员数量", width = 15, orderNum = "15")
+    private Integer careNums;
+
 
 }