add 手动增加床号信息

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

@@ -1,5 +1,7 @@
 package com.nb.web.service.bus.service.dto;
 
+import cn.hutool.core.util.StrUtil;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.nb.web.api.enums.PatientAlarmEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -69,6 +71,17 @@ public class ClinicResult  implements Serializable {
     @ApiModelProperty("评价信息")
     private int evalCount;
 
+    @ApiModelProperty(value = "废液执行人")
+    private String liquidExecutor;
+
+    @ApiModelProperty(value = "废液检查人")
+    private String liquidChecker;
+
+    @ApiModelProperty(value = "废液核对备注")
+    private String liquidRemark;
+
+    @ApiModelProperty(value = "废液核对时间")
+    private Date liquidTime;
 
     public Integer getInfusionCount() {
         if (Boolean.FALSE.equals(monitorType)) {

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

@@ -34,7 +34,10 @@
         <result column="monitor_alarm" property="monitorAlarm"/>
         <result column="infusion_count" property="infusionCount"/>
         <result column="eval_count" property="evalCount"/>
-
+        <result column="liquid_executor" property="liquidExecutor"/>
+        <result column="liquid_checker" property="liquidChecker"/>
+        <result column="liquid_remark" property="liquidRemark"/>
+        <result column="liquid_time" property="liquidTime"/>
     </resultMap>
     <select id="stats" resultMap="stats">
         SELECT
@@ -111,7 +114,10 @@
         c.patient_code as patient_code,
         c.patient_name as patient_name,
         c.ward as ward,
-        c.bed_no as bed_no,
+        CASE
+            WHEN c.manual_bedno IS NOT NULL AND c.manual_bedno != '' THEN c.manual_bedno
+            ELSE c.bed_no
+        END as bed_no,
         c.`surgery_name` as surgery_name,
         c.surgery_doctor as surgery_doctor,
         c.ana_doctor as ana_doctor,
@@ -120,6 +126,10 @@
         c.start_time as clinic_start_time,
         c.monitor_start_time as monitor_start_time,
         c.end_time as monitor_end_time
+        c.liquid_executor as liquid_executor,
+        c.liquid_checker as liquid_checker,
+        c.liquid_remark as liquid_remark,
+        c.liquid_time as liquid_time
         from bus_clinic as c
         left join bus_patient
         as p on c.patient_id = p.id
@@ -147,7 +157,7 @@
                 </foreach>
             </if>
             <if test="query.bedNo!=null and query.bedNo!=''">
-                and c.bed_no like concat('%',#{query.bedNo},'%')
+                and bed_no like concat('%',#{query.bedNo},'%')
             </if>
             <if test="query.timeRange != null and query.timeRange.size >0">
                 and c.monitor_start_time &gt; #{query.timeRange[0]} and  c.monitor_start_time &lt; #{query.timeRange[1]}