add:app端添加输注传输明细列表

nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/IPatientClient.java

@@ -107,6 +107,8 @@ public interface IPatientClient {
 
     BusClinicEntity lookClinic(String tenantId, String patientCode);
 
-    Boolean setClinic(String patientId, BusClinicEntity copyProperties);
+    boolean setClinic(BusClinicEntity busClinic);
 
+
+//    boolean setClinic(String patientId, BusClinicEntity source);
 }

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

@@ -3,6 +3,7 @@ package com.nb.app.doctor.controller;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.nb.app.assistant.api.bean.HandleBindResult;
 import com.nb.app.assistant.api.entity.AssistantUserBindEntity;
 import com.nb.app.assistant.api.feign.IAssistantUserBindClient;
@@ -18,6 +19,7 @@ import com.nb.common.websocket.WebSocketSessionLifeCycleManage;
 import com.nb.core.annotation.Log;
 import com.nb.core.result.R;
 import com.nb.web.api.entity.BusClinicEntity;
+import com.nb.web.api.entity.BusDeviceHistoryEntity;
 import com.nb.web.api.feign.IPatientClient;
 import com.nb.web.api.feign.query.GetPatientInfoVo;
 import com.nb.web.api.feign.query.PatientMonitorQuery;
@@ -25,8 +27,10 @@ import com.nb.web.api.feign.result.InviteCodeResult;
 import com.nb.web.api.feign.result.PatientMonitorDetailResult;
 import com.nb.web.api.feign.result.PatientMonitorResult;
 import com.nb.web.service.bus.entity.BusPatientEntity;
+import com.nb.web.service.bus.service.LocalBusDeviceHistoryService;
 import com.nb.web.service.bus.service.LocalBusInfusionHistoryService;
 import com.nb.web.service.bus.service.LocalBusPatientService;
+import com.nb.web.service.bus.service.dto.DeviceHistoryQuery;
 import com.nb.web.service.bus.service.dto.ManualUndoConfig;
 import com.nb.web.service.bus.utils.WsPublishUtils;
 import io.swagger.annotations.Api;
@@ -58,6 +62,8 @@ public class PatientMonitorController {
 
     private final LocalBusPatientService patientService;
 
+    private final LocalBusDeviceHistoryService historyService;
+
     private final WsPublishUtils wsPublishUtils;
 
     private final LocalBusInfusionHistoryService infusionService;
@@ -194,13 +200,20 @@ public class PatientMonitorController {
         return R.success();
     }
 
-    @PostMapping("/edit")
+    @PostMapping("/edit/clinic")
     @Log(title = "编辑患者信息")
     @ApiOperation(value = "编辑患者信息")
-    public R<Boolean> edit(@RequestBody @Validated ChangeClinicVo changeClinicVo) {
+    public R<Boolean> edit(@RequestBody @Validated BusClinicEntity busClinic) {
 
+        return R.success(patientClient.setClinic(busClinic));
+//        return R.success(patientClient.setClinic(changeClinicVo.getClinicId(), BeanUtil.copyProperties(changeClinicVo, BusClinicEntity.class)));
+    }
 
-        return R.success(patientClient.setClinic(changeClinicVo.getPatientId(),
-                BeanUtil.copyProperties(changeClinicVo, BusClinicEntity.class)));
+    @PostMapping("/query/page")
+    @ApiOperation(value = "传输明细列表")
+    public R<IPage<BusDeviceHistoryEntity>> selectPage(@RequestBody @Validated DeviceHistoryQuery query) {
+        return R.success(historyService.pageQuery(query));
     }
+
+
 }

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

@@ -1,8 +1,12 @@
 package com.nb.app.doctor.controller.vo;
 
+import com.nb.web.api.entity.BusClinicEntity;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * @Author zzy
  * @Data 2025/4/11
@@ -17,49 +21,58 @@ public class ChangeClinicVo {
     /**
      * 临床id
      */
+    @ApiModelProperty(value = "临床id",required = true)
+    @NotNull(message = "临床id不能为空")
     private String clinicId;
 
-    private String patientId;
-    /**
-     * 住院号
-     */
-    private String patientCode;
-    /**
-     * 患者姓名
-     */
-    private String patientName;
-    /**
-     * 患者性别
-     */
-    private String patientGender;
-    /**
-     * 病区
-     */
-    private String ward;
-    /**
-     * 床号
-     */
-    private String bedNO;
-    /**
-     * 手术
-     */
-    private String surgeryName;
-    /**
-     * 手术医生
-     */
-    private String surgeryDoctor;
-    /**
-     * 麻醉医生
-     */
-    private String anaDoctor;
-    /**
-     * 麻醉方式
-     */
-    private String anaType;
-    /**
-     * 镇疼方式
-     */
-    private String analType;
+    @ApiModelProperty("临床信息")
+    @NotNull(message = "临床信息不能为空")
+    private BusClinicEntity clinic;
+
+
+
+
+//    private String patientId;
+//    /**
+//     * 住院号
+//     */
+//    private String patientCode;
+//    /**
+//     * 患者姓名
+//     */
+//    private String patientName;
+//    /**
+//     * 患者性别
+//     */
+//    private String patientGender;
+//    /**
+//     * 病区
+//     */
+//    private String ward;
+//    /**
+//     * 床号
+//     */
+//    private String bedNO;
+//    /**
+//     * 手术
+//     */
+//    private String surgeryName;
+//    /**
+//     * 手术医生
+//     */
+//    private String surgeryDoctor;
+//    /**
+//     * 麻醉医生
+//     */
+//    private String anaDoctor;
+//    /**
+//     * 麻醉方式
+//     */
+//    private String anaType;
+//    /**
+//     * 镇疼方式
+//     */
+//    private String analType;
 
 //    /**
 //     * 是否开启编辑

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

@@ -55,7 +55,6 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
 /**
@@ -756,20 +755,47 @@ public class LocalBusPatientService extends BaseService<BusPatientMapper, BusPat
         return clinicService.recentClinicByPatientCode(tenantId,patientCode);
     }
 
+
+//    public boolean setClinic(String patientId, BusClinicEntity source) {
+////        if (StrUtil.isBlank(patientId)){
+////            throw new CustomException("病人ID不能为空");
+////        }
+////        BusPatientEntity patient = this.getById(patientId);
+////        if(patient==null){
+////            return false;
+////        }
+//
+////        return clinicService.update(new UpdateWrapper<BusClinicEntity>()
+////                .lambda()
+////                .eq(BusClinicEntity::getPatientId, patientId)
+////                .set(BusClinicEntity::getPatientName, copyProperties.getPatientName())
+////                .set(BusClinicEntity::getWard, copyProperties.getWard())
+////                .set(BusClinicEntity::getBedNo, copyProperties.getBedNo())
+////                .set(BusClinicEntity::getPatientGender, copyProperties.getPatientGender())
+////                .set(BusClinicEntity::getSurgeryName,copyProperties.getSurgeryName())
+////                .set(BusClinicEntity::getSurgeryDoctor,copyProperties.getSurgeryDoctor())
+////                .set(BusClinicEntity::getAnaDoctor,copyProperties.getAnaDoctor())
+////                .set(BusClinicEntity::getAnalType,copyProperties.getAnalType())
+////                .set(BusClinicEntity::getAnaType,copyProperties.getAnaType()));
+//        boolean b = clinicService.updateById(source);
+//        System.out.println(b);
+//        return b;
+//    }
+
+
     @Override
-    public Boolean setClinic(String patientId, BusClinicEntity copyProperties) {
-        BusPatientEntity patient = this.getById(patientId);
+    public boolean setClinic(BusClinicEntity busClinic) {
+        //todo:按钮是否是后端实现，关闭后自动获取信息显示什么意思？？？？
+
+        String id = busClinic.getId();
+        if (StrUtil.isBlank(id)){
+            throw new CustomException("病人ID不能为空");
+        }
+        BusPatientEntity patient = this.getById(id);
         if(patient==null){
             return false;
         }
 
-
-
-        return clinicService.update(null,new UpdateWrapper<BusClinicEntity>()
-                .lambda()
-                .eq(BusClinicEntity::getPatientId, patientId)
-                .set(BusClinicEntity::getPatientName, copyProperties.getPatientName())
-                .set(BusClinicEntity::getWard, copyProperties.getWard()));
-
+        return clinicService.updateById(busClinic);
     }
 }