diff --git a/health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/dept/DeptAssignedUserNumsRes.java b/health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/dept/DeptAssignedUserNumsRes.java
index a9ac196..872659f 100644
--- a/health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/dept/DeptAssignedUserNumsRes.java
+++ b/health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/dept/DeptAssignedUserNumsRes.java
@@ -5,6 +5,6 @@ import lombok.Data;
 @Data
 public class DeptAssignedUserNumsRes {
 
-    private Integer assignedUserNums;
-    private Integer undistributed;
+    private Integer assignedUserNums=0;
+    private Integer undistributed=0;
 }
diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/DeptStatisticDataServiceImpl.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/DeptStatisticDataServiceImpl.java
index c574748..7aed843 100644
--- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/DeptStatisticDataServiceImpl.java
+++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/DeptStatisticDataServiceImpl.java
@@ -2436,9 +2436,9 @@ public class DeptStatisticDataServiceImpl extends ServiceImpl<DeptStatisticDataM
         // 获取终端数据
         Map<String, Long> deviceCount = getDeviceCount(depart);
         // 获取指定单位共计下发终端数量
-        Long totalDeviceCount = deviceCount.get("totalDeviceCount");
+        long totalDeviceCount = null == deviceCount.get("totalDeviceCount")?0L:deviceCount.get("totalDeviceCount");
         // 获取指定单位高风险下发终端数量及共计下发终端数量
-        Long weeklyDeviceCount = deviceCount.get("weeklyDeviceCount");
+        long weeklyDeviceCount = null==deviceCount.get("weeklyDeviceCount")?0L:deviceCount.get("weeklyDeviceCount");
 
         // 前两周的周一时间和周末时间
         Date[] datesNo = new Date[2];