增加输注明细记录

pump-admin/src/main/test/com/tuoren/web/Test1.java

@@ -3,6 +3,7 @@ package com.tuoren.web;
 import com.alibaba.druid.support.json.JSONUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.gson.JsonParser;
 import com.tuoren.TuorenApplication;
 import com.tuoren.common.api.CommonResult;
 import com.tuoren.web.layer.controller.BusPatientController;
@@ -18,10 +19,7 @@ import com.tuoren.web.layer.service.IBusPumpService;
 import com.tuoren.web.layer.service.IBusReceiveRecordUpdateService;
 import com.tuoren.web.layer.service.IBusWordService;
 import com.tuoren.web.layer.service.impl.BusPumpServiceImpl;
-import com.tuoren.web.layer.vo.PumpNewParam;
-import com.tuoren.web.layer.vo.PumpParam;
-import com.tuoren.web.layer.vo.ReceiveRecordUpdateQueryParam;
-import com.tuoren.web.layer.vo.WordParam;
+import com.tuoren.web.layer.vo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.beetl.ext.simulate.JsonUtil;
 import org.junit.Test;
@@ -158,17 +156,11 @@ public class Test1 {
 
     @Test
     public void test8() throws Exception{
-        PumpNewParam param = new PumpNewParam();
-        param.setHospitalCode("bb3a62d10f8b45e38372fa17f3d56353");
-//        param.setPatientCode("999900091");
-//        param.setPatientId("651b3be0-2491-428d-95b3-3ead80618f17");
-//        param.setExceptionFlag(true);
-//        List<Date> timeRange = new ArrayList<>();
-//        timeRange.add(new Date());
-//        timeRange.add(new Date());
-//        param.setTimeRange(timeRange);
-        param.setTip(false);
-        IPage<PumpVo> pumpVoIPage = iBusPumpService.queryPumpInfoNew(param);
-        System.out.println(pumpVoIPage);
+        InfusionListParam infusionListParam = new InfusionListParam();
+//        infusionListParam.setPumpCode("51236535303002A8");
+        infusionListParam.setHospitalCode("43332553109747f3857e1e434e1e2ef4");
+//        infusionListParam.setPatientCode("999900091");
+        IPage<BusPumpEntity> busPumpEntityIPage = iBusPumpService.queryInfusionList(infusionListParam);
+        System.out.println(busPumpEntityIPage);
     }
 }

pump-web/src/main/java/com/tuoren/web/layer/controller/BusPumpController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.tuoren.web.layer.d0.PumpRemoveRequestDTO;
+import com.tuoren.web.layer.vo.InfusionListParam;
 import com.tuoren.web.layer.vo.PumpNewParam;
 import com.tuoren.web.layer.vo.PumpParam;
 import com.tuoren.web.layer.entity.BusPatientEntity;
@@ -231,6 +232,15 @@ public class BusPumpController{
         }
     }
 
+    @ApiOperation("获取输注明细列表")
+    @PostMapping("/getInfusionList")
+    public CommonResult getInfusionList(@RequestBody InfusionListParam param) {
+        IPage<BusPumpEntity> iPage = iBusPumpEntityService.queryInfusionList(param);
+        if(!iPage.getRecords().isEmpty()){
+            return CommonResult.success(iPage);
+        }
+        return CommonResult.noData();
+    }
 
     /**
      * 撤泵

pump-web/src/main/java/com/tuoren/web/layer/service/IBusPumpService.java

@@ -2,6 +2,7 @@ package com.tuoren.web.layer.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.tuoren.web.layer.d0.PumpRemoveRequestDTO;
+import com.tuoren.web.layer.vo.InfusionListParam;
 import com.tuoren.web.layer.vo.PumpNewParam;
 import com.tuoren.web.layer.vo.PumpParam;
 import com.tuoren.web.layer.entity.BusPumpEntity;
@@ -62,6 +63,12 @@ public interface IBusPumpService extends IService<BusPumpEntity> {
      * @return
      */
     IPage<PumpVo> queryPumpInfoNew(PumpNewParam pumpParam);
+    /**
+     * @description: 获取输注明细分页
+     * @author wangzl
+     * @date 2025/8/20
+     */
+    IPage<BusPumpEntity> queryInfusionList(InfusionListParam param);
 
 
     void removePump(List<String> ids);

pump-web/src/main/java/com/tuoren/web/layer/service/impl/BusPumpServiceImpl.java

@@ -19,6 +19,7 @@ import com.tuoren.web.layer.mapper.BusPumpMapper;
 import com.tuoren.web.layer.mapper.BusReceiveRecordCopyMapper;
 import com.tuoren.web.layer.mapper.BusReceiveRecordMapper;
 import com.tuoren.web.layer.service.IBusPumpService;
+import com.tuoren.web.layer.vo.InfusionListParam;
 import com.tuoren.web.layer.vo.PumpNewParam;
 import com.tuoren.web.layer.vo.PumpParam;
 import com.tuoren.web.rabbit.RabbitHandle;
@@ -217,6 +218,29 @@ public class BusPumpServiceImpl extends ServiceImpl<BusPumpMapper, BusPumpEntity
         return iPage;
     }
 
+    /**
+     * @param param
+     * @description: 获取输注明细分页
+     * @author wangzl
+     * @date 2025/8/20
+     */
+    @Override
+    public IPage<BusPumpEntity> queryInfusionList(InfusionListParam param) {
+        LambdaQueryWrapper<BusPumpEntity> queryWrapper = new LambdaQueryWrapper<>();
+        if(StrUtil.isNotBlank(param.getHospitalCode())){
+            queryWrapper.eq(BusPumpEntity::getHospitalCode, param.getHospitalCode());
+        }
+        if(StrUtil.isNotBlank(param.getPumpCode())){
+            queryWrapper.eq(BusPumpEntity::getPumpCode, param.getPumpCode());
+        }
+        if(StrUtil.isNotBlank(param.getPatientCode())){
+            queryWrapper.eq(BusPumpEntity::getPatientCode, param.getPatientCode());
+        }
+        queryWrapper.orderByDesc(BusPumpEntity::getLastUploadTime);
+        IPage<BusPumpEntity> page = new Page<>(param.getPageNo(), param.getPageSize());
+        return page(page,queryWrapper);
+    }
+
     @Override
     public void removePump(List<String> ids) {
         if(CollectionUtil.isEmpty(ids)){

pump-web/src/main/java/com/tuoren/web/layer/vo/InfusionListParam.java

@@ -0,0 +1,29 @@
+package com.tuoren.web.layer.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangzl
+ * @description: TODO
+ * @date 2025/8/20 7:54
+ */
+@Data
+@ApiModel("输注明细参数")
+public class InfusionListParam {
+
+    @ApiModelProperty(value = "第几页")
+    private Integer pageNo = 1;
+    @ApiModelProperty(value = "条数")
+    private Integer pageSize = 10;
+
+    @ApiModelProperty(value = "住院号")
+    private String patientCode;
+
+    @ApiModelProperty(value = "医院编码")
+    private String hospitalCode;
+
+    @ApiModelProperty(value = "泵编码")
+    private String pumpCode;
+}