update:传输明细列表(平板技改)

nb-service/app-doctor/src/main/java/com/nb/app/doctor/controller/PatientMonitorController.java

@@ -48,6 +48,7 @@ import com.nb.web.service.bus.service.LocalBusPatientService;
 import com.nb.web.service.bus.service.constant.AbstractConstantService;
 import com.nb.web.service.bus.service.constant.LocalBusConMixService;
 import com.nb.web.service.bus.service.dto.DeviceHistoryQuery;
+import com.nb.web.service.bus.service.dto.DeviceInfusionHistoryQuery;
 import com.nb.web.service.bus.service.dto.EditModifyQuery;
 import com.nb.web.service.bus.service.dto.ManualUndoConfig;
 import com.nb.web.service.bus.utils.WsPublishUtils;
@@ -225,7 +226,7 @@ public class PatientMonitorController {
     }
 
     @PostMapping("/undo")
-    @Log(title = "批量撤泵")
+    @Log(title = "批量撤泵(平板技改)")
     @ApiOperation(value = "批量撤泵，只撤泵，不切换",notes = "当出现泵重复状态时，若用户想要取消对其他副泵的监控，则调用此接口进行撤泵操作")
     public R shift(@RequestBody @Validated ManualUndoConfig manualUndoVo, @RequestAttribute("tenantId") @ApiParam(hidden = true) String tenantId) {
         log.info("批量撤泵，【{}】", JSONUtil.toJsonStr(manualUndoVo));
@@ -242,7 +243,7 @@ public class PatientMonitorController {
     }
 
     @PostMapping("/doFinished")
-    @Log(title = "手动结束管理")
+    @Log(title = "手动结束管理(平板技改)")
     @ApiOperation(value = "手动结束管理",notes = "病患当前绑定主设备必须要在关机、不在服务器、待机中才能结束管理")
     public R<Boolean> appFinished(
             @RequestBody MonitorFinishedVo monitorFinishedVo,
@@ -283,16 +284,16 @@ public class PatientMonitorController {
 
     @PostMapping("/clinic/edit")
     @Log(title = "编辑患者信息")
-    @ApiOperation(value = "编辑患者信息")
+    @ApiOperation(value = "编辑患者信息(平板技改)")
     public R<Boolean> edit(@Validated(GenericEntity.Update.class) @RequestBody  BusClinicEntity busClinic) {
         return R.success(patientClient.setClinic(busClinic));
     }
 
 
     @PostMapping("/query/page")
-    @ApiOperation(value = "传输明细列表")
-    public R<IPage<BusDeviceHistoryEntity>> selectPage(@RequestBody @Validated DeviceHistoryQuery query) {
-        return R.success(historyService.pageQuery(query));
+    @ApiOperation(value = "传输明细列表(平板技改)")
+    public R<List<BusDeviceHistoryEntity>> selectPage(@RequestBody @Validated DeviceInfusionHistoryQuery query) {
+        return R.success(historyService.infusionQuery(query));
     }
 
     @PostMapping("/editRecord")

nb-service/web-service/src/main/java/com/nb/web/service/bus/mapper/BusDeviceHistoryMapper.java

@@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nb.web.api.entity.BusDeviceHistoryEntity;
 import com.nb.web.service.bus.service.dto.DeviceHistoryQuery;
+import com.nb.web.service.bus.service.dto.DeviceInfusionHistoryQuery;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @author lifang
  * @version 1.0.0
@@ -19,4 +22,6 @@ import org.apache.ibatis.annotations.Param;
 public interface BusDeviceHistoryMapper extends BaseMapper<BusDeviceHistoryEntity> {
 
     IPage<BusDeviceHistoryEntity> pageQuery(Page<BusDeviceHistoryEntity> page,@Param("query") DeviceHistoryQuery query);
+
+    List<BusDeviceHistoryEntity> InfusionQuery(@Param("query") DeviceInfusionHistoryQuery query);
 }

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusDeviceHistoryService.java

@@ -8,6 +8,7 @@ import com.nb.web.api.feign.IPatientClient;
 import com.nb.web.service.bus.mapper.BusDeviceHistoryMapper;
 import com.nb.web.service.bus.service.dto.DeviceHistoryQuery;
 import com.nb.common.crud.BaseService;
+import com.nb.web.service.bus.service.dto.DeviceInfusionHistoryQuery;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -61,6 +62,17 @@ public class LocalBusDeviceHistoryService extends BaseService<BusDeviceHistoryMa
         return this.baseMapper.pageQuery(query.getPage(),query);
     }
 
+    public List<BusDeviceHistoryEntity> infusionQuery(DeviceInfusionHistoryQuery query){
+        //如果临床id不能为空
+        if(query.getClinicId()==null){
+            throw new RuntimeException("临床id不能为空");
+        }
+        if (query.getDeviceId()==null){
+            throw new RuntimeException("设备id不能为空");
+        }
+        return this.baseMapper.InfusionQuery(query);
+    }
+
     public BigDecimal computeLossRate(long totalCount,List<BusDeviceHistoryEntity> sources) {
         if(totalCount==0){
             return BigDecimal.ZERO;
@@ -79,10 +91,10 @@ public class LocalBusDeviceHistoryService extends BaseService<BusDeviceHistoryMa
     }
 
     public BigDecimal computeLossRate(List<BusDeviceHistoryEntity> sources) {
-        if (CollectionUtil.isEmpty(sources)) {
+        if(CollectionUtil.isEmpty(sources)){
             return BigDecimal.ZERO;
         }
         long count = sources.stream().map(BusDeviceHistoryEntity::getDataNumber).distinct().count();
-        return computeLossRate(count, sources);
+        return computeLossRate(count,sources);
     }
 }

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/DeviceInfusionHistoryQuery.java

@@ -0,0 +1,28 @@
+package com.nb.web.service.bus.service.dto;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.nb.web.api.entity.BusDeviceHistoryEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName AlarmQuery.java
+ * @Description TODO
+ * @createTime 2022年05月16日 21:28:00
+ */
+@Data
+@ApiModel("设备历史信息查询参数")
+public class DeviceInfusionHistoryQuery {
+    @ApiModelProperty(value = "临床id",required = true)
+    @NotNull(message = "临床id不能为空")
+    private String clinicId;
+    @ApiModelProperty("设备id")
+    private String deviceId;
+    @ApiModelProperty("输注id")
+    private String infusionId;
+}

nb-service/web-service/src/main/resources/mapper/bus/BusDeviceHistoryMapper.xml

@@ -22,8 +22,22 @@
         order by h.upload_time desc
     </select>
 
-
-
-
-
+    <select id="InfusionQuery" parameterType="com.nb.web.service.bus.service.dto.DeviceInfusionHistoryQuery" resultType="com.nb.web.api.entity.BusDeviceHistoryEntity">
+        select h.* from
+        bus_device_history  as h
+        join (select * from bus_infusion_history
+        <where>
+            <if test="query.clinicId !=null">
+                and clinic_id=#{query.clinicId}
+            </if>
+            <if test="query.deviceId !=null">
+                and device_id=#{query.deviceId}
+            </if>
+            <if test="query.infusionId !=null">
+                and id=#{query.infusionId}
+            </if>
+        </where>) as i
+        on h.infusion_id=i.id
+        order by h.upload_time desc
+    </select>
 </mapper>