update 删除重复报警和提醒

nb-framework/src/main/java/com/nb/framework/config/SaTokenConfig.java

@@ -34,7 +34,7 @@ public class SaTokenConfig {
     static {
         IGNORE_URL.add("/api/druid/**");
         IGNORE_URL.add("/druid/**");
-        IGNORE_URL.add("/api/favicon.ico");
+        IGNORE_URL.add("/favicon.ico");
         IGNORE_URL.add("/sys/app/get");
         IGNORE_URL.add("/index");
         IGNORE_URL.add("/login");

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

@@ -214,20 +214,13 @@ public class BusPatientController  implements BaseQueryController<BusPatientEnti
     @PostMapping("/{alarm}/_count")
     @SaCheckPermission("device:patient:query")
     @ApiOperation(value = "病人报警数量统计",notes = "病人报警数量统计 0、未报警 1、泵重复 2、无泵，权限标识为【device:patient:query】")
-    public R<Integer> alarmCount(@PathVariable("alarm") int alarm){
+    public R<Long> alarmCount(@PathVariable("alarm") int alarm ){
         PatientAlarmEnum alarmEnum = PatientAlarmEnum.of(alarm);
         if(alarmEnum==null){
-            return R.success(0);
+            return R.success(0L);
         }
         log.info("病人报警数量统计,【{}】",alarmEnum);
-        switch (alarmEnum){
-            case DEVICE_REPEAT:
-                return this.repeatCount();
-            case NONE:
-                return this.noneCount();
-            default:return R.success(0);
-
-        }
+        return R.success(patientService.patientAlarmCount(alarmEnum));
 
     }
 

nb-system/src/main/resources/mapper/bus/BusPatientMapper.xml

@@ -149,7 +149,7 @@
              c.monitor_start_time as monitor_start_time,
              c.config_person as config_person
             FROM (SELECT `name`,gender,CODE,tenant_id,id FROM bus_patient WHERE bus_patient.`alarm`=2 ) AS p
-            join  (SELECT * FROM bus_clinic WHERE finished=0 and monitor_type=1) AS c ON  c.`patient_code`=p.code
+            join  (SELECT * FROM bus_clinic WHERE finished=0 and monitor_type=1) AS c ON  c.`patient_id`=p.id
             order by c.monitor_start_time desc;
         </select>
 
@@ -433,7 +433,6 @@
             </if>
         </where>
         ) as c on p.id=c.patient_id
-        --         ) as c on p.code=c.patient_code
         <where>
             <if test="alarmValue!=null">
                 and p.alarm=#{alarmValue}