fix 临床分析

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

@@ -19,6 +19,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
@@ -59,6 +60,9 @@ public class BusStatsAnalyseController {
         if(CollectionUtil.isEmpty(query.getStartTimeRange())&&CollectionUtil.isEmpty(query.getClinicStartTimeRange())){
             throw new CustomException("开始时间不能为空");
         }
+        if(CollectionUtil.isNotEmpty(query.getStartTimeRange())&&CollectionUtil.isNotEmpty(query.getClinicStartTimeRange())){
+            throw new CustomException("开始时间参数有误");
+        }
         if(CollectionUtil.size(query.getStartTimeRange())!=2&&CollectionUtil.size(query.getClinicStartTimeRange())!=2){
             throw new CustomException("查询开始时间时，需设置【最小开始时间】-【最大开始时间的】时间范围");
         }
@@ -68,6 +72,7 @@ public class BusStatsAnalyseController {
         }
         CommonStats commonStats=statsMap.get(analyseEnum);
 
+        List<Date> startTimRange=CollectionUtil.isEmpty(query.getStartTimeRange())?query.getClinicStartTimeRange():query.getStartTimeRange();
         long t0 = System.currentTimeMillis();
         List queryResult = commonStats.queryResult(query);
         //提示分析时，根据所选设备类型 进行分析判定
@@ -80,10 +85,10 @@ public class BusStatsAnalyseController {
         result.setPie(commonStats.handlePie(queryResult));
         long t1 = System.currentTimeMillis();
         System.out.println("饼图耗时 = " + (t1 - startTime));
-        result.setLine(commonStats.handleLine(queryResult, query.getTimeUnit(),query.getStartTimeRange().get(0),query.getStartTimeRange().get(1)));
+        result.setLine(commonStats.handleLine(queryResult, query.getTimeUnit(),startTimRange.get(0),startTimRange.get(1)));
         long t2 = System.currentTimeMillis();
         System.out.println("线段图耗时 = " + (t2 - t1));
-        result.setTable( commonStats.handleTable(queryResult,query.getTimeUnit(),query.getStartTimeRange().get(0),query.getStartTimeRange().get(1)));
+        result.setTable( commonStats.handleTable(queryResult,query.getTimeUnit(),startTimRange.get(0),startTimRange.get(1)));
         long t3 = System.currentTimeMillis();
         System.out.println("图表耗时 = " + (t3- t2));
         ThreadUtil.remove();

nb-system/src/main/java/com/nb/bus/stats/analyse/AlarmStatsAnalyse.java

@@ -54,7 +54,7 @@ public class AlarmStatsAnalyse implements CommonStats<CombineAlarmResult> {
     public List<LineResult> handleLine(List<CombineAlarmResult> sources, StatsTimeUnit unit,Date minTime,Date maxTime) {
         //根据报警时间对结果进行区分统计
         Map<String, List<CombineAlarmResult>> groupByTime = groupByTime(sources, unit,minTime,maxTime,
-                t->Boolean.TRUE.equals(t.getIsAlarm()),
+                t->true,
                 CombineAlarmResult::getAlarmTime,
                 t->CollectionUtil.newHashSet(unit.parse(t.getAlarmTime())));
         List<LineResult> result = new ArrayList<>();
@@ -219,7 +219,7 @@ public class AlarmStatsAnalyse implements CommonStats<CombineAlarmResult> {
         TableResult result = new TableResult();
         //根据时间对结果进行区分统计
         Map<String, List<CombineAlarmResult>> groupByTimeResults = groupByTime(sources, unit,minTime,maxTime,
-                t->Boolean.TRUE.equals(t.getIsAlarm()),
+                t->true,
                 CombineAlarmResult::getAlarmTime,
                 t->CollectionUtil.newHashSet(unit.parse(t.getAlarmTime())));
         List<String> columnNames = Arrays.asList(

nb-system/src/main/java/com/nb/bus/stats/analyse/InfusionDoseStatsAnalyse.java

@@ -1,7 +1,6 @@
 package com.nb.bus.stats.analyse;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
 import com.nb.bus.enums.StatsAnalyseEnum;
 import com.nb.bus.enums.StatsTimeUnit;
 import com.nb.bus.service.LocalBusInfusionHistoryService;
@@ -9,7 +8,6 @@ import com.nb.bus.service.dto.CombineHistoryResult;
 import com.nb.bus.service.dto.CombineQuery;
 import com.nb.bus.service.dto.CombineResult;
 import com.nb.bus.stats.CommonHistoryStats;
-import com.nb.bus.stats.CommonStats;
 import com.nb.bus.stats.entity.LineResult;
 import com.nb.bus.stats.entity.PieResult;
 import com.nb.bus.stats.entity.TableResult;
@@ -18,7 +16,6 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @author lifang

nb-system/src/main/java/com/nb/bus/stats/analyse/PcaStatsAnalyse.java

@@ -158,7 +158,8 @@ public class PcaStatsAnalyse implements CommonHistoryStats {
                 StatsColumn.of("时间","时间"),
                 StatsColumn.of("输注总数","输注总数"),
                 StatsColumn.of("自控总数","自控总数"),
-                StatsColumn.of("自控有效数","自控无效数"),
+                StatsColumn.of("自控有效数","自控有效数"),
+                StatsColumn.of("自控无效数","自控无效数"),
                 StatsColumn.of("人均自控数","人均自控数"),
                 StatsColumn.of("人均自控有效数","人均自控有效数"),
                 StatsColumn.of("人均自控无效数","人均自控无效数"));

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

@@ -525,7 +525,7 @@
 
             <if test="query.clinicStartTimeRange != null and query.clinicStartTimeRange.size > 0">
                 and monitor_start_time &gt;=  #{query.clinicStartTimeRange[0]}
-                <if test="query.startTimeRange.size >1 ">
+                <if test="query.clinicStartTimeRange.size >1 ">
                     and monitor_start_time &lt;=  #{query.clinicStartTimeRange[1]}
                 </if>
             </if>