add

废液管理
修改异常标识

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

@@ -98,6 +98,10 @@ public class PatientMonitorQuery  implements Serializable {
     @JsonIgnore
     private List<Integer> warnFlow;
 
+    @ApiModelProperty(value = "是否为废液查询",hidden = true)
+    @JsonIgnore
+    private Boolean liquid;
+
     /**
      * 根据此提醒进行解析
      * @see  WarnEnum

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

@@ -4,6 +4,7 @@ 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 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.metadata.IPage;
@@ -15,10 +16,9 @@ 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.api.feign.query.PatientMonitorQuery;
+import com.nb.web.api.feign.result.PatientMonitorResult;
+import com.nb.web.service.bus.controller.vo.*;
 import com.nb.web.service.bus.entity.BusInfusionModifyEntity;
 import com.nb.web.service.bus.entity.BusPatientEntity;
 import com.nb.web.service.bus.service.*;
@@ -50,12 +50,11 @@ import java.util.stream.Collectors;
 public class BusLiquidController {
     private final LocalBusClinicService clinicService;
 
-
+    private final LocalBusPatientService patientService;
     @PostMapping("/page")
     @ApiOperation(value = "废液列表分页查询",notes = "权限  无")
-    public R<IPage<ClinicResult>> page(@RequestBody@Validated ClinicQuery query) {
-        query.setLiquid(Boolean.TRUE);
-        return R.success(clinicService.pageQuery(query));
+    public R<IPage<BusLiquidListVO>> page(@RequestAttribute("tenantId")@ApiParam(hidden = true) String tenantId, @RequestBody@Validated BusLiquidQuery query) {
+        return R.success(patientService.selectLiquidPage(query));
     }
 
     @PostMapping("/batchHandle")

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

@@ -10,6 +10,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.nb.web.api.dto.BusPatientAbnormalMarkDTO;
 import com.nb.web.api.entity.BusClinicEntity;
 import com.nb.web.api.entity.BusDeviceEntity;
 import com.nb.web.api.entity.BusDeviceManualEntity;
@@ -66,6 +67,17 @@ public class BusPatientController  implements BaseQueryController<BusPatientEnti
     private final WsPublishUtils wsPublishUtils;
 
     private final LocalBusDeviceService deviceService;
+    /**
+     * @description: 网络泵技改项目
+     * ①在主界面 添加/删除 患者的异常标识
+     * @author lifang
+     * @date 2025-04-17
+     */
+    @PostMapping("/editAbnormalMark")
+    @ApiOperation(value = "修改异常标识(平板技改Web端)")
+    public R<Boolean> editAbnormalMark(@RequestBody@Validated BusPatientAbnormalMarkDTO source) {
+        return R.success(patientService.editAbnormalMark(source));
+    }
 
     @PostMapping("/no_page")
     @Log(title = "输注监控列表查询")

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

@@ -0,0 +1,73 @@
+package com.nb.web.service.bus.controller.vo;
+
+import com.nb.web.api.bean.FormulaDrugDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.ToString;
+import org.apache.poi.hpsf.Decimal;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName PatientMonitorResult.java
+ * @Description TODO
+ * @createTime 2022年04月21日 15:57:00
+ */
+@ApiModel("废液显示")
+@Data
+@ToString
+public class BusLiquidListVO implements Serializable {
+    @ApiModelProperty("手术id")
+    private String clinicId;
+
+    @ApiModelProperty(value = "住院号")
+    private String patientCode;
+
+    @ApiModelProperty(value = "病人id")
+    private String patientId;
+
+    @ApiModelProperty(value = "病人名称")
+    private String patientName;
+
+    @ApiModelProperty(value = "病区")
+    private String ward;
+
+    @ApiModelProperty(value = "床号")
+    private String bedNo;
+
+    @ApiModelProperty(value = "泵id")
+    private String deviceId;
+
+    @ApiModelProperty(value = "泵别名")
+    private String deviceAlias;
+
+    @ApiModelProperty("用泵时间")
+    private Date clinicStartTime;
+
+    @ApiModelProperty("撤泵时间")
+    private Date undoTime;
+
+    @ApiModelProperty("配方")
+    private FormulaDrugDomain formula;
+
+    @ApiModelProperty(value = "总量")
+    private Decimal totalDose;
+
+    @ApiModelProperty(value = "剩余量")
+    private Decimal remainDose;
+
+    @ApiModelProperty(value = "废液执行人")
+    private String liquidExecutor;
+
+    @ApiModelProperty(value = "废液检查人")
+    private String liquidChecker;
+
+    @ApiModelProperty(value = "废液核对备注")
+    private String liquidRemark;
+
+    @ApiModelProperty(value = "废液核对时间")
+    private Date liquidTime;
+}

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

@@ -35,6 +35,7 @@ import com.nb.web.api.feign.IPatientClient;
 import com.nb.web.api.feign.query.DoctorPatientMonitorQuery;
 import com.nb.web.api.feign.result.*;
 import com.nb.web.api.feign.query.PatientMonitorQuery;
+import com.nb.web.service.bus.controller.vo.BusLiquidListVO;
 import com.nb.web.service.bus.entity.*;
 import com.nb.web.api.enums.DeviceAlarmEnum;
 import com.nb.web.api.enums.DeviceStatusEnum;
@@ -851,4 +852,8 @@ public class LocalBusPatientService extends BaseService<BusPatientMapper, BusPat
         BusClinicEntity clinic = clinicMapper.selectById(clinicId);
         return clinic;
     }
+
+    public IPage<BusLiquidListVO> selectLiquidPage(BusLiquidQuery query) {
+        return null;
+    }
 }

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

@@ -0,0 +1,40 @@
+package com.nb.web.service.bus.service.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.*;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName PatientMonitorQuery.java
+ * @Description TODO
+ * @createTime 2022年04月22日 08:50:00
+ */
+@Data
+@ApiModel("废液查询参数")
+public class BusLiquidQuery implements Serializable {
+    @ApiModelProperty(value = "查询时间区间")
+    private List<Date> undoTime;
+
+    @ApiModelProperty(value = "住院号")
+    private String patientCode;
+
+    @ApiModelProperty(value = "床号")
+    private String bedNo;
+
+    @ApiModelProperty("病区查询集合")
+    private List<String> wards;
+
+    @ApiModelProperty(value = "病人名称")
+    private String patientName;
+
+    @ApiModelProperty(value = "手术名称")
+    private String clinicName;
+
+    @ApiModelProperty(value = "核对状态")
+    private String liquidType;
+}