fix 自控分析统计

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

@@ -56,10 +56,10 @@ public class BusStatsAnalyseController {
         if (StrUtil.isBlank(tenantId)) {
             throw new TenantException();
         }
-        if(CollectionUtil.isEmpty(query.getStartTimeRange())){
+        if(CollectionUtil.isEmpty(query.getStartTimeRange())&&CollectionUtil.isEmpty(query.getClinicStartTimeRange())){
             throw new CustomException("开始时间不能为空");
         }
-        if(CollectionUtil.size(query.getStartTimeRange())!=2){
+        if(CollectionUtil.size(query.getStartTimeRange())!=2&&CollectionUtil.size(query.getClinicStartTimeRange())!=2){
             throw new CustomException("查询开始时间时，需设置【最小开始时间】-【最大开始时间的】时间范围");
         }
         StatsAnalyseEnum analyseEnum = StatsAnalyseEnum.of(type);

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

@@ -390,7 +390,7 @@
         </where>
         ) as p on p.id = c.patient_id
         join (select * from bus_device_history) as h on h.infusion_id=i.id
-        group by i.id,p.id,DATE_FORMAT(upload_time,'%Y-%m-%d')
+        group by i.id,p.id,DATE_FORMAT(h.upload_time,'%Y-%m-%d')
     </select>