add 临床详情

nb-system/src/main/java/com/coffee/bus/controller/BusPatientController.java

@@ -9,6 +9,7 @@ import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.mapper.Mapper;
+import com.coffee.bus.controller.vo.ClinicEditVo;
 import com.coffee.bus.controller.vo.GetPatientInfoVo;
 import com.coffee.bus.controller.vo.MonitorDetailVo;
 import com.coffee.bus.controller.vo.MonitorFinishedVo;
@@ -20,6 +21,7 @@ import com.coffee.bus.registry.patient.PatientRegistry;
 import com.coffee.bus.service.*;
 import com.coffee.bus.service.dto.*;
 import com.coffee.bus.utils.WsPublishUtils;
+import com.coffee.common.annotation.Log;
 import com.coffee.common.crud.BaseService;
 import com.coffee.common.crud.controller.BaseQueryController;
 import com.coffee.common.exception.CustomException;
@@ -32,6 +34,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.async.DeferredResult;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
 
 /**
  * @author lifang
@@ -65,6 +68,19 @@ public class BusPatientController  implements BaseQueryController<BusPatientEnti
         return R.success(patientService.selectAll(query));
     }
 
+
+    @Log(title = "查询该次临床过程中所用的所有输注信息")
+    @PostMapping("/look/{clinicId}/infusion")
+    @SaCheckPermission("bus:patient:query")
+    @ApiOperation(value = "查询该次临床过程中所用的所有输注信息",notes = "查询该次临床过程中所用的所有输注信息,权限【bus:patient:query】")
+    public R lookUpAllInfusion(@PathVariable("clinicId") String clinicId){
+        List<BusInfusionHistoryEntity> infusionHistories = infusionService.list(new QueryWrapper<BusInfusionHistoryEntity>().lambda().eq(BusInfusionHistoryEntity::getClinicId, clinicId));
+        return R.success(infusionHistories.stream()
+                .map(InfusionHistorySmallResult::of)
+                .sorted(Comparator.comparing(InfusionHistorySmallResult::getStartTime))
+                .collect(Collectors.toList()));
+    }
+
     @GetMapping("/repeat/device")
     @ApiOperation(value = "设备重复提示列表",notes = "当出现病患同一时间绑定了多个泵时,调用该接口查询出所有设备重复报警数据，权限【无】")
     public R<List<PatientDeviceRepeatResult>> repeatDevice(){

nb-system/src/main/java/com/coffee/bus/controller/vo/MonitorDetailVo.java

@@ -19,7 +19,7 @@ public class MonitorDetailVo {
     @ApiModelProperty("监控类型 true、输注监控 false、其他监控")
     @NotNull(message = "监控类型不能为空")
     private Boolean monitorType;
-    @ApiModelProperty("临床id")
+    @ApiModelProperty("临床id,若传入infusionId,即查该次此输注的数据;若不传入infusionId，即查询病人最新的输注数据")
     @NotNull(message = "临床id不能为空")
     private String clinicId;
     @ApiModelProperty("病号")

nb-system/src/main/java/com/coffee/bus/service/dto/InfusionHistorySmallResult.java

@@ -0,0 +1,28 @@
+package com.coffee.bus.service.dto;
+
+import com.coffee.bus.entity.BusInfusionHistoryEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName InfusionHistorySmallDto.java
+ * @Description TODO
+ * @createTime 2022年07月02日 11:01:00
+ */
+@Data
+@ApiModel("输注历史简化信息")
+@AllArgsConstructor
+public class InfusionHistorySmallResult {
+    private String infusionId;
+    private String deviceId;
+    private Date startTime;
+
+    public static InfusionHistorySmallResult of(BusInfusionHistoryEntity source) {
+        return new InfusionHistorySmallResult(source.getId(),source.getDeviceId(),source.getStartTime());
+    }
+}