add

废液管理
修改异常标识

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

@@ -423,7 +423,6 @@ public class LocalBusClinicService extends BaseService<BusClinicMapper, BusClini
                     List<FormulaDrugDetailDomain> detail = record.getFormula().getDetail();
                     if(CollectionUtil.isNotEmpty(detail)){
                         for (FormulaDrugDetailDomain drug : detail) {
-                            drug.setDose(drug.getDose()+drug.getUnit());
                             //根据药液剩余量计算药品残余量
                             if(StrUtil.isEmpty(drug.getDose())|| !NumberUtil.isNumber(drug.getDose()) ||ObjectUtil.equals(record.getRemainDose(), BigDecimal.ZERO)){
                                 drug.setRemainDose("0"+drug.getUnit());
@@ -433,6 +432,7 @@ public class LocalBusClinicService extends BaseService<BusClinicMapper, BusClini
                                 BigDecimal multiply = totalDose.multiply(divide);
                                 drug.setRemainDose(multiply+drug.getUnit());
                             }
+                            drug.setDose(drug.getDose()+drug.getUnit());
                         }
                     }
                 }