Bläddra i källkod

update 聊天室更新用户头像

18339543638 3 år sedan
förälder
incheckning
f943c75256

+ 5 - 3
nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/BusInfusionHistoryController.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.Mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.nb.web.api.entity.BusDeviceHistoryEntity;
 import com.nb.web.api.entity.BusInfusionHistoryEntity;
+import com.nb.web.service.bus.controller.vo.InfusionTestVo;
 import com.nb.web.service.bus.service.LocalBusDeviceHistoryService;
 import com.nb.web.service.bus.service.LocalBusInfusionHistoryService;
 import com.nb.web.service.bus.service.dto.CombineQuery;
@@ -22,6 +23,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Authorization;
 import lombok.AllArgsConstructor;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
@@ -86,7 +88,7 @@ public class BusInfusionHistoryController implements BaseQueryController<BusInfu
     @PostMapping("/test/query/page")
     @SaCheckPermission("bus:infusion:test")
     @ApiOperation(value = "输注丢包率列表",notes = "权限:【bus:infusion:test】",authorizations = {@Authorization("bus:infusion:test")})
-    public R<List<TestBusInfusionHistory>> testPage(){
+    public R<List<TestBusInfusionHistory>> testPage(@RequestBody@Validated InfusionTestVo source){
         List<BusInfusionHistoryEntity> infusions = infusionHistoryService.list(new QueryWrapper<BusInfusionHistoryEntity>()
                 .lambda()
                 .select(BusInfusionHistoryEntity::getId,
@@ -99,7 +101,7 @@ public class BusInfusionHistoryController implements BaseQueryController<BusInfu
                         BusInfusionHistoryEntity::getPatientCode,
                         BusInfusionHistoryEntity::getPatientId)
                 .eq(BusInfusionHistoryEntity::getFinished, false)
-                .eq(BusInfusionHistoryEntity::getTest,true));
+                .eq(BusInfusionHistoryEntity::getTest,Boolean.TRUE.equals(source.getTest())));
         List<TestBusInfusionHistory> result = infusions
                 .stream()
                 .map(TestBusInfusionHistory::valueOf)
@@ -121,7 +123,7 @@ public class BusInfusionHistoryController implements BaseQueryController<BusInfu
                                 }else {
                                     long count = historyEntities.stream().map(BusDeviceHistoryEntity::getDataNumber).distinct().count();
                                     infusion.setReceiveNum(count);
-                                    infusion.setLossRate(deviceHistoryService.computeTestLossRate(300,count,historyEntities));
+                                    infusion.setLossRate(deviceHistoryService.computeTestLossRate(source.getBasicNum(),count,historyEntities));
                                 }
                             }
                     );

+ 24 - 0
nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/vo/InfusionTestVo.java

@@ -0,0 +1,24 @@
+package com.nb.web.service.bus.controller.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @ClassName : InfusionTestVo
+ * @Description :
+ * @Author : LF
+ * @Date: 2022年12月08日
+ */
+@ApiModel("质量测试")
+@Data
+public class InfusionTestVo {
+    @ApiModelProperty("是否查询测试数据")
+    private Boolean test;
+
+    @ApiModelProperty("计算基数")
+    @NotNull(message = "计算基数不能为空")
+    private Integer basicNum;
+}