update 删除重复报警和提醒

nb-system/src/main/java/com/nb/bus/controller/BusPatientController.java

@@ -214,13 +214,21 @@ 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(@PathVariable("alarm") int alarm){
+    public R<Integer> alarmCount(@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(alarmEnum));
+        switch (alarmEnum){
+            case DEVICE_REPEAT:
+                return this.noneCount();
+            case NONE:
+                return this.repeatCount();
+            default:return R.success(0);
+
+        }
+
     }
 
     @PostMapping("/shift")