add

废液管理
修改异常标识

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.ToString;
 import org.apache.poi.hpsf.Decimal;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -56,10 +57,10 @@ public class BusLiquidListVO implements Serializable {
     private FormulaDrugDomain formula;
 
     @ApiModelProperty(value = "总量")
-    private Decimal totalDose;
+    private BigDecimal totalDose;
 
     @ApiModelProperty(value = "剩余量")
-    private Decimal remainDose;
+    private BigDecimal remainDose;
 
     @ApiModelProperty(value = "废液执行人")
     private String liquidExecutor;

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

@@ -307,6 +307,7 @@
         join bus_patient as p on c.patient_id = p.id
         join bus_infusion_history as i on p.infusion_id = i.id
         <where>
+            c.finished = 1
             <if test="query.undoTime != null and query.undoTime.size ==1">
                 and undo_time &gt; #{query.timeRange[0]}
             </if>