add 看护人列表

nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/BusPatientController.java

@@ -3,6 +3,7 @@ package com.nb.web.service.bus.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
@@ -226,13 +227,18 @@ public class BusPatientController  implements BaseQueryController<BusPatientEnti
     @PostMapping("/{alarm}/_count")
     @SaCheckPermission("device:patient:query")
     @ApiOperation(value = "病人报警数量统计",notes = "病人报警数量统计 0、未报警 1、泵重复 2、无泵，权限标识为【device:patient:query】")
-    public R<Long> alarmCount( @RequestAttribute("tenantId")@ApiParam(hidden = true) String tenantId,@PathVariable("alarm") int alarm ){
+    public R<Integer> alarmCount( @RequestAttribute("tenantId")@ApiParam(hidden = true) String tenantId,@PathVariable("alarm") int alarm ){
         PatientAlarmEnum alarmEnum = PatientAlarmEnum.of(alarm);
         if(alarmEnum==null){
-            return R.success(0L);
+            return R.success(0);
         }
-        log.info("病人报警数量统计,【{}】",alarmEnum);return R.success( patientService.patientAlarmCount(tenantId,alarmEnum));
-
+        log.info("病人报警数量统计,【{}】",alarmEnum);
+        if (PatientAlarmEnum.DEVICE_NONE.equals(alarmEnum)){
+            return R.success(CollectionUtil.size(patientService.noneDevice()));
+        }else  if (PatientAlarmEnum.DEVICE_REPEAT.equals(alarmEnum)){
+            return R.success(CollectionUtil.size(patientService.repeatDevice()));
+        }
+        return R.success(0);
     }
 
     @PostMapping("/shift")