add

废液管理
修改异常标识

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

@@ -2,6 +2,7 @@ package com.nb.web.service.bus.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -110,8 +111,8 @@ public class BusLiquidController {
             }else {
                 excelVO.setDeviceAlias(record.getDeviceId());
             }
-            excelVO.setClinicStartTime(DateUtil.formatDateTime(record.getClinicStartTime()));
-            excelVO.setUndoTime(DateUtil.formatDateTime(record.getUndoTime()));
+            excelVO.setClinicStartTime(DateUtil.format(record.getClinicStartTime(), "yyyy/MM/dd HH:mm"));
+            excelVO.setUndoTime(DateUtil.format(record.getUndoTime(),"yyyy/MM/dd HH:mm"));
             excelVO.setName(formulaDrugDetailDomain.getName());
             excelVO.setDose(formulaDrugDetailDomain.getDose()+formulaDrugDetailDomain.getUnit());
             //根据药液剩余量计算药品残余量

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

@@ -36,7 +36,7 @@ public class BusLiquidQuery implements Serializable {
     private String patientName;
 
     @ApiModelProperty(value = "手术名称")
-    private String clinicName;
+    private String surgeryName;
 
     @ApiModelProperty(value = "是否核对  0、未核对 1、已核对")
     private Boolean liquidType;

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

@@ -317,7 +317,7 @@
                 and undo_time > #{query.undoTime[0]} and  c.undo_time < #{query.undoTime[1]}
             </if>
             <if test="query.patientCode!=null and query.patientCode!=''">
-                and patient_code like concat('%',#{query.patientCode},'%')
+                and c.patient_code like concat('%',#{query.patientCode},'%')
             </if>
             <if test="query.bedNo!=null and query.bedNo!=''">
                 and bed_no like concat('%',#{query.bedNo},'%')
@@ -332,7 +332,7 @@
                 and patient_name like concat('%',#{query.patientName},'%')
             </if>
             <if test="query.clinicName!=null and query.clinicName!=''">
-                and clinic_name like concat('%',#{query.clinicName},'%')
+                and c.surgery_name like concat('%',#{query.surgeryName},'%')
             </if>
             <if test="query.liquidType!=null and query.liquidType == false">
                 and liquid_checker is null