update 镇痛分析

update value序列化方式

nb-admin/src/main/resources/application-prod.yml

@@ -80,7 +80,7 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 192.168.100.32
+    host: 47.101.214.91
     # 端口，默认为6379
     port: 9736
     # 数据库索引

nb-admin/src/test/java/com/nb/admin/BusDeviceTest.java

@@ -1,12 +1,14 @@
 package com.nb.admin;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nb.bus.entity.BusDeviceEntity;
 import com.nb.bus.entity.BusDeviceHistoryEntity;
 import com.nb.bus.service.LocalBusDeviceHistoryService;
 import com.nb.bus.service.LocalBusDeviceService;
 import com.nb.bus.service.dto.ClinicAnalInfusionRecord;
+import com.nb.common.util.RedissonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -14,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 
@@ -33,6 +36,9 @@ public class BusDeviceTest {
 
     @Autowired
     LocalBusDeviceHistoryService historyService;
+
+    @Autowired
+    RedissonUtil redissonUtil;
     @Test
     public void test001(){
         BusDeviceEntity device = new BusDeviceEntity();
@@ -56,7 +62,10 @@ public class BusDeviceTest {
 
     @Test
     public void test002(){
-        deviceService.removeByDeviceId("nbceshi001");
+        String analSortKey="anal:sort:51075519383902A6";
+
+        Collection<Object> valueRange = redissonUtil.getValueRange(analSortKey, DateUtil.parse("2022/01/02").getTime(), true, new Date().getTime(), true);
+        System.out.println(valueRange);
     }
 
 

nb-common/src/main/java/com/nb/common/cache/value/SimpleValue.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.annotation.IEnum;
 import lombok.AllArgsConstructor;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
 import java.lang.reflect.Array;
@@ -17,6 +18,7 @@ import java.util.*;
 @Slf4j
 public class SimpleValue implements Value {
 
+    @Getter
     private Object nativeValue;
 
     @Override

nb-system/src/main/java/com/nb/bus/hospital/config/handler/AnalPoorDisappearHandler.java

@@ -7,6 +7,7 @@ import com.nb.bus.hospital.config.HospitalFunctionAnalConfigHandler;
 import com.nb.bus.registry.device.DeviceRegistry;
 import com.nb.bus.service.LocalBusInfusionHistoryService;
 import com.nb.bus.utils.WsPublishUtils;
+import com.nb.common.cache.value.Value;
 import com.nb.common.delay_queue.handler.DelayMessageHandler;
 import com.nb.common.delay_queue.message.DelayMessage;
 import lombok.AllArgsConstructor;

nb-system/src/main/java/com/nb/bus/stats/analyse/AnalStatsAnalyse.java → nb-system/src/main/java/com/nb/bus/stats/report/AnalStatsAnalyse.java

@@ -1,4 +1,4 @@
-package com.nb.bus.stats.analyse;
+package com.nb.bus.stats.report;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
@@ -39,7 +39,11 @@ public class AnalStatsAnalyse implements CommonStats<CombineResult> {
     private final LocalBusInfusionHistoryService infusionHistoryService;
     @Override
     public List<CombineResult> queryResult(CombineQuery query) {
-        return infusionHistoryService.queryStatsAnal(query);
+        List<CombineResult> combineResults = infusionHistoryService.queryStatsAnal(query);
+        //根据临床id进行去重操作
+        Map<String, CombineResult> clinicIdMap = new HashMap<>();
+        combineResults.forEach(result->clinicIdMap.computeIfAbsent(result.getClinicId(),k->result));
+        return new ArrayList<>(clinicIdMap.values());
     }
 
     @Override
@@ -96,7 +100,7 @@ public class AnalStatsAnalyse implements CommonStats<CombineResult> {
         Map<String, List<CombineResult>> groupByTime = groupByTime(results, unit);
         List<String> allAnal = getAllAnalName( groupByAnal(results), getConAnal());
         List<StatsColumn> allColumn = getAllColumn(allAnal);
-        allColumn.add(1,StatsColumn.of("输注总数","输注总数"));
+        allColumn.add(1,StatsColumn.of("总人数","总人数"));
         List<Map<String, Object>> contents = new ArrayList<>();
         result.setContent(contents);
         result.setColumn(allColumn);
@@ -108,7 +112,7 @@ public class AnalStatsAnalyse implements CommonStats<CombineResult> {
             //表格内容
             LinkedHashMap<String, Object> contentValues = new LinkedHashMap<>();
             contentValues.put("时间",timeRange);
-            contentValues.put("输注总数",combineResult.stream().map(CombineResult::getId).distinct().count());
+            contentValues.put("总人数",combineResult.stream().map(CombineResult::getId).distinct().count());
             //获取特定时间区间内 各镇痛方式的 数量
             allAnal.forEach(anal->{
                 //折线图内容