add

废液管理
修改异常标识

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

@@ -428,10 +428,14 @@ public class LocalBusClinicService extends BaseService<BusClinicMapper, BusClini
                             if(StrUtil.isEmpty(drug.getDose())|| !NumberUtil.isNumber(drug.getDose()) ||ObjectUtil.equals(record.getRemainDose(), BigDecimal.ZERO)){
                                 drug.setRemainDose("0"+drug.getUnit());
                             }else {
-                                BigDecimal divide = record.getRemainDose().divide(record.getTotalDose(), 2, RoundingMode.CEILING);
-                                BigDecimal totalDose = BigDecimal.valueOf(Double.valueOf(drug.getDose()));
-                                BigDecimal multiply = totalDose.multiply(divide);
-                                drug.setRemainDose(multiply+drug.getUnit());
+                                if(ObjectUtil.isNull(record.getRemainDose())||ObjectUtil.isNull(record.getTotalDose())){
+                                    drug.setRemainDose("0"+drug.getUnit());
+                                }else {
+                                    BigDecimal divide = record.getRemainDose().divide(record.getTotalDose(), 2, RoundingMode.CEILING);
+                                    BigDecimal totalDose = BigDecimal.valueOf(Double.valueOf(drug.getDose()));
+                                    BigDecimal multiply = totalDose.multiply(divide);
+                                    drug.setRemainDose(multiply+drug.getUnit());
+                                }
                             }
                             drug.setDose(drug.getDose()+drug.getUnit());
                         }

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

@@ -309,7 +309,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
+            c.finished = 1 and  i.undo_time is not null
             <if test="query.undoTime != null and query.undoTime.size ==1">
                 and undo_time &gt; #{query.undoTime[0]}
             </if>