add 手动增加床号信息

nb-admin/src/main/resources/db/migration/V5__init_20250910.sql

@@ -0,0 +1,9 @@
+ALTER TABLE bus_clinic ADD COLUMN manual_bedno VARCHAR(255) COMMENT '手动编辑的床号信息';
+
+ALTER TABLE bus_clinic ADD COLUMN liquid_executor text COMMENT '废液收集执行人';
+
+ALTER TABLE bus_clinic ADD COLUMN liquid_checker text COMMENT '废液收集核对人';
+
+ALTER TABLE bus_clinic ADD COLUMN liquid_remark text COMMENT '废液收集备注';
+
+ALTER TABLE bus_clinic ADD COLUMN liquid_time  datetime(3) COMMENT '废液收集时间';

nb-service-api/web-service-api/src/main/java/com/nb/web/api/entity/BusClinicEntity.java

@@ -3,6 +3,7 @@ package com.nb.web.api.entity;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.nb.web.api.bean.FormulaDrugDomain;
 import com.nb.web.api.bean.UndoDeviceConfig;
 import com.nb.core.entity.TenantGenericEntity;
@@ -161,6 +162,23 @@ public class BusClinicEntity extends TenantGenericEntity<String,String> {
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String abnormalReason;
 
+    @ApiModelProperty(value = "手动输入的床号信息",hidden = true)
+    @JsonIgnore
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String manualBedno;
+
+    @ApiModelProperty(value = "废液执行人")
+    private String liquidExecutor;
+
+    @ApiModelProperty(value = "废液检查人")
+    private String liquidChecker;
+
+    @ApiModelProperty(value = "废液核对备注")
+    private String liquidRemark;
+
+    @ApiModelProperty(value = "废液核对时间")
+    private Date liquidTime;
+
     public String getWeight() {
         return StrUtil.isBlank(weight)?null:weight;
     }

nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/BusClinicController.java

@@ -193,6 +193,7 @@ public class BusClinicController {
     @SaCheckPermission(value = {"bus:clinic:edit","bus:monitor:edit"},mode = SaMode.OR)
     @ApiOperation(value = "根据ID修改数据（所有临床数据）",notes = "新增病人信息,权限【bus:clinic:edit】或【bus:monitor:edit】")
     public R update(@RequestBody @Validated(GenericEntity.Update.class)BusClinicEntity payload){
+        payload.setManualBedno(payload.getBedNo());
         return clinicService.updateById(payload)?R.success(payload):R.fail("更新失败");
     }
 

nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/BusLiquidController.java

@@ -0,0 +1,67 @@
+package com.nb.web.service.bus.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.nb.core.annotation.Log;
+import com.nb.core.entity.GenericEntity;
+import com.nb.core.enums.ExportType;
+import com.nb.core.exception.CustomException;
+import com.nb.core.result.ExportResult;
+import com.nb.core.result.R;
+import com.nb.web.api.entity.*;
+import com.nb.web.service.bus.controller.vo.ClinicEditVo;
+import com.nb.web.service.bus.controller.vo.ClinicExportVo;
+import com.nb.web.service.bus.controller.vo.ClinicStatsVo;
+import com.nb.web.service.bus.controller.vo.VisitRecord;
+import com.nb.web.service.bus.entity.BusInfusionModifyEntity;
+import com.nb.web.service.bus.entity.BusPatientEntity;
+import com.nb.web.service.bus.service.*;
+import com.nb.web.service.bus.service.dto.*;
+import com.nb.web.service.bus.utils.AnalExportUtils;
+import io.swagger.annotations.*;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName BusHospitalController.java
+ * @Description
+ * @createTime 2022年03月19日 09:28:00
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/bus/liquid")
+@Slf4j
+@Api(tags = "废液管理",description = "统一权限前缀(bus:liquid),例如新增bus:liquid:add")
+public class BusLiquidController {
+    private final LocalBusClinicService clinicService;
+
+
+    @PostMapping("/page")
+    @ApiOperation(value = "废液列表分页查询",notes = "权限  无")
+    public R<IPage<ClinicResult>> page(@RequestBody@Validated ClinicQuery query) {
+        query.setLiquid(Boolean.TRUE);
+        return R.success(clinicService.pageQuery(query));
+    }
+
+    @PostMapping("/batchHandle")
+    @SaCheckPermission("bus:liquid:edit")
+    @ApiOperation(value = "批量处理废液",notes = "权限【bus:liquid:edit】")
+    public R<IPage<ClinicResult>> latestPage(@RequestBody@Validated LiquidBatchHandleDTO source) {
+        return R.success(null);
+    }
+}

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

@@ -44,12 +44,15 @@ public class ClinicQuery implements Serializable {
     @ApiModelProperty("是否结束")
     private Integer finished;
 
+    @ApiModelProperty(value = "是否为废液查询",hidden = true)
+    @JsonIgnore
+    private Boolean liquid;
+
     @ApiModelProperty("分页查询参数")
     @NotNull(message = "分页查询参数不可为空")
     private Page<ClinicResult> page;
 
 
-
     @ApiModelProperty("按照临床开始时间排序")
     private Boolean monitorStartTimeDesc;
 
@@ -64,6 +67,8 @@ public class ClinicQuery implements Serializable {
     @JsonIgnore
     private List<String> orderByAsc=new ArrayList<>();
 
+
+
     public void setMonitorStartTimeDesc(Boolean monitorStartTimeDesc) {
         this.monitorStartTimeDesc = monitorStartTimeDesc;
         if (Boolean.TRUE.equals(monitorStartTimeDesc)) {

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

@@ -0,0 +1,30 @@
+package com.nb.web.service.bus.service.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.*;
+@Data
+public class LiquidBatchHandleDTO {
+    @ApiModelProperty("临床id")
+    @NotNull(message = "临床id不能为空")
+    private List<String> clinicIds;
+
+    @ApiModelProperty("废液处理执行人")
+    @NotBlank(message = "废液处理执行人不能为空")
+    private String liquidExecutor;
+
+    @ApiModelProperty("废液处理核对人")
+    @NotBlank(message = "废液处理核对人不能为空")
+    private String liquidChecker;
+
+    @ApiModelProperty("废液处理时间")
+    @NotBlank(message = "废液处理时间不能为空")
+    private Date liquidTime;
+
+    @ApiModelProperty("废液处理备注")
+    private String liquidRemark;
+
+}

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

@@ -124,6 +124,10 @@
         left join bus_patient
         as p on c.patient_id = p.id
         <where>
+            <if test="query.liquid!=null and query.liquid == true">
+                and c.finished= 1 and i.undo = 1
+            </if>
+
             <if test="query.monitorType!=null and query.monitorType!=''">
                 and c.monitor_type=#{query.monitorType}
             </if>